merge: do not warn about copy and rename in the same transaction (
issue2113)
--- a/mercurial/copies.py Tue May 22 14:37:20 2012 -0500
+++ b/mercurial/copies.py Wed May 23 17:25:48 2012 +0200
@@ -285,7 +285,7 @@
diverge2 = set()
for of, fl in diverge.items():
- if len(fl) == 1 or of in c2:
+ if len(fl) == 1 or of in c1 or of in c2:
del diverge[of] # not actually divergent, or not a rename
else:
diverge2.update(fl) # reverse map for below
--- a/tests/test-rename-merge1.t Tue May 22 14:37:20 2012 -0500
+++ b/tests/test-rename-merge1.t Wed May 23 17:25:48 2012 +0200
@@ -95,9 +95,6 @@
$ hg up c761c6948de0
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg up
- note: possible conflict - b was renamed multiple times to:
- b3
- b4
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
Check for issue2642