Commit anywhere/anytime with Mercurial
So you have been using subversion for the past few years and now your team has decided to move on to Mercurial for all the benefits. Two or more people are working on the same branch and they’re pushing code to the main copy of the repository before you’re done with your changes.
In the Subversion world, if you tried to commit in this same situation you’d get an error saying that your repository checkout is not up to date, so you’d fix this by doing:
[bash]
$ svn up #gets the latest changes from the repo and it tries to merge all remote changes
$ # … solve any conflicts if they arise.
$ svn ci -m "my commit message" #push your latest changes to the main repo.
[/bash]
In Mercurial it’s a little bit longer
[bash]
$ hg ci -m "my local changes"
$ hg pull #this brings the latest version of the repo, but doesn’t change the state of your files.
$ hg merge #when you’re ready, you merge the changes
[/bash]
If at this point you try to push, you will get the following error
[bash]
$ hg push
pushing to https://user@server.com/company/project
searching for changes
abort: push creates new remote heads!
(did you forget to merge? use push -f to force)
[/bash]
first, ignore the “push -f to force”, they should remove that message and put something like
[bash]
(did you forget to merge and commit?)
[/bash]
After a lot of thinking I was doing something wrong with the merge, I realized that before pushing you have to commit your merge locally as well, makes sense, so the whole sequence should be like this instead:
[bash]
$ hg ci -m "my local changes" #same as ‘hg commit’
$ hg pull #this brings the latest version of the repo, but doesn’t change the state of your files.
$ hg merge #when you’re ready, you merge the changes
$ hg ci -m "merging latest changes from repository"
$ hg push
pushing to https://user@server.com/company/project
searching for changes
http authorization required
realm: Bitbucket.org HTTP
user: gubatron
password:
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
bb/acl: gubatron is allowed. accepted payload.
[/bash]
So, yes, its a little more work to merge and commit, but remember that you’re working now on a distributed fashion and you have to think a little bit differently, you gotta merge locally, fix any conflicts if they arise, commit the changes and push them. In exchange you don’t get to deal with lots of .svn folders, no single point of failure (one remote repo that could go down and leave all developers without version control until it’s back up), and super easy branching on a single folder, no need to checkout branches and be writing down revision numbers.
Just remember that pulls don’t change your local changes unless you explicitly ask to do so by invoking hg merge; hg commit, which would be the equivalent (at least I see it like this) to svn up
