Completely baffled

[Martin Geisler]

Isaac Jurado <diptongo at gmail.com> writes:

> In distributed VCS you always commit first, then pull and merge (or
> rebase, depends on how confident you are with the tool). I had a hard
> time explaining my colleagues at work to stop using "hg pull -u" and
> commiting first instead.

Running

  $ hg commit
  $ hg pull --rebase

should do the same as running:

  $ hg pull --update
  $ hg commit

with the difference that you have the option to further tweak your dirty
working copy before you actually do the commit. In particular, the any
merge conflicts should be the same and you should get the same tool
support.

Now, I agree that it's good practice to finish what one is doing before
pulling in changes from others. Keeping related changes together makes
it easier to review them later.

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://mercurial.aragost.com/kick-start/