The difference between update and merge

Matt Mackall mpm at selenic.com
Wed Dec 7 20:52:20 UTC 2011


On Wed, 2011-12-07 at 21:31 +0100, Martin Geisler wrote:
> 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?

Why special-case it? Remember, there's also merge -f.

-- 
Mathematics is the supreme nostalgia of our time.





More information about the Mercurial mailing list