I have a local mercurial repository with some site-specific changes in it. What I would like to do is set a couple files to be un-commitable so that they aren't automatically committed when I do an hg commit with no arguments. Right now, I'm doing complicated things with mq and guards to achieve this, pushing and popping and selecting ...
I'm relatively new to Mercurial and my team is trying it out right now as a replacement for Subversion. How can I commit and push a single file out to another repository while leaving other modifications in my working directory uncommitted (or at least not pushed to the other repository)? This happens for us with database migrations....
I use Tortoise SVN usuallly, but I have been looking into Mercurial since it is a distributed revision control system. What I am looking for, in both systems, is a tool that let me pick only parts of a file and commit them. If I want to do this now, I have to copy to a temp version of the file and keep only the changes I want to commit...
When using mercurial, I'd like to be able to diff the working copy of a file with the tip file in my default remote repository. Is there an easy way to do this? I know I can do an "hg incoming -p" to see the patch sets of changes coming in, but it'd be nice to just directly see the actual changes for a particular file that I'd get if I...
At work, we're using ClearCase right now. However, there's a lot of overhead required, especially when someone does something stupid (like erase a view with multiple reserved check-outs on the trunk...). Since we're trying to lower our overhead and be as lightweight as possible, we've through about the possibility of ditching CC and go...
When using Mercurial I sometimes find that it is hard to understand the relationship between changesets when there are thousands of changesets, and sometimes ten or more active branches at any one time. Currently, I use hgview which is okay, and while it makes a reasonable attempt to represent the parent relationships it is still basica...
Hi, For a new Java web project I thought about using: Eclipse as IDE Mercurial for version control Some kind of bug tracking software I have heard of bug tracking software where you can tie a change to an unresolved bug when you check it in. I haven't used any such solution myself, but it sounds good. Are there any good bug tracking...
We are considering a move from SVN to Mercurial, and have encountered a stumbling block. We currently use svn:externals to automatically pull a common set of libraries into the working directory. I can't find support for anything like this in Mercurial. Is there a way to do this automatically with Mercurial, or do I need to fake it as ...
Within the last year I have become addicted to subversion. I am an only developer and I also work on a few of my own projects. With SVN its really easy to manage everything - and because it is hosted on an online server though HTTPS I can access my code from anywhere. It is also great for deploying code to our production/development serv...
Here are 2 different questions but I think they are related. When using git how do I find which changes I have committed locally but haven't yet pushed to a remote branch? I'm looking for something similar to the Mercurial command "hg outgoing" When using git how do I find what changes a remote branch has prior to doing a pull? I'm loo...
Hi, I'm just starting with Mercurial and one of the things that I should do is select a merge tool. I was thinking to use WinMerge for that purpose, but I can't find the way to select this in particular. There are references for all the other merge tools around, but not for WinMerge. So, should I use WinMerge or there's a better tool f...
Hi, Everytime that I do an 'hg diff file.ext' I end up using a console diff application. Is there a way to change that? I can't find a reference in Mercurial documentation (I'm not talking about merge!). I would like to use Kdiff3 or WinMerge (I'm using Windows). Thanks for your time. Best regards. ...
I'm using TortoiseHg 0.5 (which includes Mercurial 1.0.2) on Vista64. My understanding from the Mercurial Book is that Mercurial should handle filenames in a case-insensitive manner on a case-insensitive filesystem (such as NTFS, which is what I'm on). However I find that my installation of Mercurial is in fact sensitive to case: >hg st...
The Emacs Wiki lists several modes for supporting mercurial inside of Emacs, including the built-in VC mode. Is it worth exploring any of the other modes, such as the one distributed with mercurial itself? ...
I have a private repository with bitbucket. I'm using Mercurial Distributed SCM (version 0.9.3) on Ubuntu. When I try to clone my repository, I'm prompted for my username and password which I enter correctly. as a result i get: abort: authorization failed This works perfectly fine from windows. I just want to make sure I'm not missi...
I am currently using Subversion as my Source Control system, mainly because I found ANkhSVN to be a quite nicely integrated into Visual Studio. But many people seem to be using Git or Mercurial and others with great success. Now, I am wondering how to use a system like Git without some sort of IDE integration. Going to the command lin...
I am looking for an expression for the .hgignore file, to ignore all files beneath a specified folder. eg: I would like to ignore all files and folders beneath bin Actually any advice on how the expressions are formed would be great ...
Can Apache common vfs api retrieve/update/add files from/to the Mercurial version control system? Common vfs does have an interface api for accessing vcs. Is there a provider for Mercurial? hbagchi ...
I have a largish Mercurial repository that I've decided would be better as several smaller repositories. Is there a way that I can split the repository and have each piece retain its revision history? ...
How do you reverse the effect of a merge on polarised branches without dying of agony? This problem has been plaguing me for months and I have finally given up. You have 1 Repository, with 2 Named Branches. A and B. Changes that occur to A will inevitably occur on B. Changes that occur directly on B MUST NEVER occur on A. In s...