The difference between update and merge

[Isaac Jurado]

On Tue, Dec 6, 2011 at 11:07 PM, Martin Geisler <mg at lazybytes.net> wrote:
>
> It was a little more complicated than I remembered -- you have to
> first mark the file as unresolved before 'hg resolve --tool
> internal:local' has any effect. So
>
>  hg resolve --unmark afile
>  hg resolve --tool internal:local afile
>
> brings back the original diff. Updating back to the OLD revision
> triggers another merge conflict, but this time picking the local
> version in the merge tool is the right thing to do:
>
>  HGMERGE=internal:local hg update 0
>
> So it's definitely not something to play around with on your first try
> with Mercurial, but we do have remarkably good support for preserving
> changes in a dirty working copy.

Now, THAT is impressive.  I had no clue about it, thanks and sorry for
being an ass ;-)

Out of curiosity, where is the original diff stored?

Cheers.

-- 
Isaac Jurado

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