Completely baffled

[Isaac Jurado]

On Mon, Dec 5, 2011 at 11:35 AM, Martin Geisler <mg at aragost.com> wrote:
>
> 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.

I'm sorry to disagree but, no way.  I know update merges three-way but
there is one major drawback: you can't go back.  With merge or rebase,
you can abort and start over as many times as you want.  Unless there is
something I don't know about, updating a dirty working copy is only one
way.

Regards.

-- 
Isaac Jurado

"The noblest pleasure is the joy of understanding"
Leonardo da Vinci