Mercurial > hg
diff mercurial/merge.py @ 3727:0fb66912040a
merge: report destinations of moves in merge action messages
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 30 Nov 2006 17:36:33 -0600 |
parents | 6cb3aca69cdc |
children | a32b4b930079 |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Nov 30 13:51:58 2006 -0800 +++ b/mercurial/merge.py Thu Nov 30 17:36:33 2006 -0600 @@ -224,13 +224,14 @@ elif f in copy: f2 = copy[f] if f in ma: # case 3,20 A/B/A - act("remote moved", "m", f, f2, f2, fmerge(f, f2, f), True) + act("remote moved to " + f2, "m", + f, f2, f2, fmerge(f, f2, f), True) else: if f2 in m1: # case 2 A,B/B/B - act("local copied", "m", + act("local copied to " + f2, "m", f, f2, f, fmerge(f, f2, f2), False) else: # case 4,21 A/B/B - act("local moved", "m", + act("local moved to " + f2, "m", f, f2, f, fmerge(f, f2, f2), False) elif f in ma: if n != ma[f] and not overwrite: @@ -255,7 +256,8 @@ if f2 not in m2: # already seen continue # rename case 1, A/A,B/A - act("remote copied", "m", f2, f, f, fmerge(f2, f, f2), False) + act("remote copied to " + f, "m", + f2, f, f, fmerge(f2, f, f2), False) elif f in ma: if overwrite or backwards: act("recreating", "g", f, m2.execf(f))