The difference between update and merge

[Martin Geisler]

Matt Mackall <mpm at selenic.com> writes:

> On Wed, 2011-12-07 at 12:46 +0100, Martin Geisler wrote:
>> Isaac Jurado <diptongo at gmail.com> writes:
>>
>>> Out of curiosity, where is the original diff stored?
>>
>> It's stored in a .hg/merge/<hash> file where <hash> is the SHA-1 has
>> of the file. It's also used by normal merges between committed
>> changes, though I cannot figure out right now why it's necessary in
>> that case.
>
> If you discover the automatic merge of a single file failed in your
> extensive post-merge testing, you can re-resolve it.

Yes, but could Mercurial not just grab the file from one of the two
parent changesets in that case?

It's super cool that merges triggered by 'hg update' are handled like
this, but it seems to me that normal merges (started by 'hg merge')
don't need these copies. (Not that I suggest changing anything, I'm just
curious to see if there is a corner-case I'm forgetting here.)

-- 
Martin Geisler

Mercurial links: http://mercurial.ch/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20111207/a8175e18/attachment.asc>