[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mercurial
Subject:    Re: Debugging a broken merge
From:       Matt Mackall <mpm () selenic ! com>
Date:       2007-11-30 17:44:48
Message-ID: 20071130174448.GD19691 () waste ! org
[Download RAW message or body]

On Fri, Nov 30, 2007 at 12:01:30PM -0500, Yaron Minsky wrote:
> I have a case where a merge has done some unexpected things.  In
> particular, in a branch a file was moved and then changed.  Some of the
> associated changes seem to have been lost in the shuffle.  Does anyone
> have suggestions as to what I can do to debug this merge and understand
> it a little better?  Maybe some way of getting more debugging info out,
> for instance, determining what revision was used as parent for the 3-way
> merge?

That should be shown with the --debug switch.

The 0.9.5 release will show additional information about copy
detection as well.

-- 
Mathematics is the supreme nostalgia of our time.
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial
[prev in list] [next in list] [prev in thread] [next in thread]