Mercurial > hg
changeset 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 | 752884db5037 |
| children | a32b4b930079 |
| files | mercurial/merge.py tests/test-rename-merge1.out tests/test-rename-merge2.out |
| diffstat | 3 files changed, 14 insertions(+), 12 deletions(-) [+] |
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))
--- a/tests/test-rename-merge1.out Thu Nov 30 13:51:58 2006 -0800 +++ b/tests/test-rename-merge1.out Thu Nov 30 17:36:33 2006 -0600 @@ -4,7 +4,7 @@ resolving manifests overwrite None partial False ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 - a: remote moved -> m + a: remote moved to b -> m b2: remote created -> g merging a and b my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
--- a/tests/test-rename-merge2.out Thu Nov 30 13:51:58 2006 -0800 +++ b/tests/test-rename-merge2.out Thu Nov 30 17:36:33 2006 -0600 @@ -5,7 +5,7 @@ overwrite None partial False ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 rev: versions differ -> m - a: remote copied -> m + a: remote copied to b -> m merging a and b my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 copying a to b @@ -26,7 +26,7 @@ overwrite None partial False ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 a: remote is newer -> g - b: local copied -> m + b: local copied to a -> m rev: versions differ -> m getting a merging b and a @@ -47,7 +47,7 @@ resolving manifests overwrite None partial False ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b - a: remote moved -> m + a: remote moved to b -> m rev: versions differ -> m merging a and b my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 @@ -68,7 +68,7 @@ resolving manifests overwrite None partial False ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 - b: local moved -> m + b: local moved to a -> m rev: versions differ -> m merging b and a my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 @@ -351,7 +351,7 @@ resolving manifests overwrite None partial False ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 - a: remote moved -> m + a: remote moved to b -> m rev: versions differ -> m merging a and b my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 @@ -372,7 +372,7 @@ resolving manifests overwrite None partial False ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 - b: local moved -> m + b: local moved to a -> m rev: versions differ -> m merging b and a my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 @@ -391,7 +391,7 @@ resolving manifests overwrite None partial False ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f - b: local moved -> m + b: local moved to a -> m rev: versions differ -> m c: remote created -> g merging b and a