It looks like hg out --patch or hg out -p is a good way to see what code is pushed out to the repo (when it is pushed)... but the diff is in text format. Is there a way to make it use kdiff3 as well? ...
Hello, I noticed, that this kind of functionality exists for subversion and it works very nicely. I was wondering if there is such thing for SourceGear Vault. ...
I'm trying to setup mercurial using the HgLogin I have the following problem system. I done everything that is needed but when I tried to login to my repository I receive this answer: remote: /home/mercurial/hg-login: line 1: use: command not found : command not foundrial/hg-login: line 1: : command not foundrial/hg-login: line 2: remo...
I have imported a project with Mercurial (hg clone ...). When opening it with Eclipse, a red exclamation mark appears by the project's name in the Project Explorer, and it cannot be built. Silly messages like "import java.util cannot be resolved" appear, and errors in files are not marked in the Package Explorer. How can I resolve thi...
I'm using Mercurial 1.6. I have a repo with a few subrepos (11). I would like to push the parent repo to the default remote repo without pushing the child repos. Reasons for wanting to do this include: I'm using SSH repos, and it takes a long time to establish a connection and push nothing to each of the subrepos. I have commits in sub...
I work mostly with Git and have a lot of code on github. I would also like to have it on Bitbucket, for people using mercurial but more importantly as I want to also have the code on my domian, and BItbucket supports Cnames for hosted code. So is there a way for me to mostly work with Git, but also be able to push to HG. Github created...
When using Mercurial, how do you undo all changes in the working directory since the last commit? It seems like this would be a simple thing, but it's escaping me. For example, let's say I have 4 commits. Then, I make some changes to my code. Then I decide that my changes are bad and I just want to go back to the state of the code at my...
This sounds kind of complex, so let me explain: Project_A has lived for some time within its own Mercurial repository. Project_A is now getting folded into a new super project, Super-Project_B. Super-Project_B also has a mercurial repository. We would prefer if Project_A were not a subrepo, but instead just a normal child, but we also ...
Possible Duplicates: Why is git better than Subversion? I've already read a lot (not enough to get the perfect picture though) about versioning systems, and the obvious conclusion is that GIT is simply the best. Or Bazaar maybe. Or Mercurial. But if so it was, then nobody would be using SVN, but they still do. Why? I myself ha...
Is Mercurial always using the external merge tools when two branches that are merging have changes to the same file? Or does it first see if it can merge the file itself, and only punting to the external tool if it can't? The reason I'm asking is that I am (once again) re-reading the tutorial written by Joel Spolsky on Mercurial and on...
I am a mercurial noob, and am scratching my head trying to figure this out. I have added a file to the repository in the past. The repo knows about it: hg log Purchase.php changeset: 40:0bb0a5041ae9 parent: 36:b1627cf0f7a3 user: josh date: Wed Jun 30 21:41:07 2010 +0530 summary: purchase logic now, if I...
It seems to be quite hard to find good references about the pros and cons of these Version control systems. If someone can make a short and neat paper about it, mirror it and post it here, I think a lot of people would be less confused. What version control system should I use ? I think it depend on the project and on the number of peo...
Let's say that I'm working on a project, with files A, B, and C. I get halfway through adding a feature, modifying A and B, before I realize that something needs cleaning. Because of the circumstances, it's optimal to interrupt the feature work to do the cleaning. This involves making changes in A, B, and C. After I'm done with the feat...
I'm trying to determine how people use "branch repositories" while also using subrepos. Let's say I have repo Main containing a solution file (.NET), and populated with subrepos A, B, C: /Main - A - B - C MainSolution.sln A, B, and C, while being shared between other "Main" repos, are very tightly integrated into Main...
When using hg branch FeatureBranchName and publishing it to a central repo that is shared amongst developers, is there a way to eventually close the FeatureBranchName when its development has officially been merged with the default branch? It would also be helpful if the FeatureBranchName was not visible when performing a hg branches co...
Hi! I want to create a script that will do something if hg incoming -v contains specific file. Say if hg incoming -v | grep models.py > 0 than do ./manage.py resetdb. Something like this. How can i set a flag (in bash script) based on hg incoming -v | grep manage.py result? ...
I have a local mercurial repository with 5 commits that still need to be pushed to the server. However, I accidentally included a line in two specific files since the last 4 commits that I really don't want to have in there (nor in one of the changesets). Is there any practical way to remove those lines in these two files? (apart from t...
I set up a new project on Google Code and have set Mercurial as my Source Control. I did an hg clone <url> just like the Checkout page states and got a copy of this repository locally. At the moment, it's still empty. Now I added some files in this folder and tried committing them with: hg com -m "Initial Commit" but I am always getti...
I'm new mercurial user. I setup the acl extension adding this into my hgrc file: [hooks] pretxnchangegroup.acl = python:hgext.acl.hook [acl] sources = serve pull push [acl.deny] ** = mercurial So with this code above I deny access to all files to user "mercurial". I successfully tested the acl extension and it works perfectly when I...
Him I have two hg repositories. main/lib main/application I think I would like to have a checkpoint so that I can store the state of lib and application at one time. I read there is a concept of subreposities... I had an idea to create a third repository in main in which I could store the needed state... What would you recommend to...