Show More
@@ -285,7 +285,7 b' def mergecopies(repo, c1, c2, ca):' | |||||
285 |
|
285 | |||
286 | diverge2 = set() |
|
286 | diverge2 = set() | |
287 | for of, fl in diverge.items(): |
|
287 | for of, fl in diverge.items(): | |
288 | if len(fl) == 1 or of in c2: |
|
288 | if len(fl) == 1 or of in c1 or of in c2: | |
289 | del diverge[of] # not actually divergent, or not a rename |
|
289 | del diverge[of] # not actually divergent, or not a rename | |
290 | else: |
|
290 | else: | |
291 | diverge2.update(fl) # reverse map for below |
|
291 | diverge2.update(fl) # reverse map for below |
@@ -95,9 +95,6 b" We'd rather not warn on divergent rename" | |||||
95 | $ hg up c761c6948de0 |
|
95 | $ hg up c761c6948de0 | |
96 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
96 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
97 | $ hg up |
|
97 | $ hg up | |
98 | note: possible conflict - b was renamed multiple times to: |
|
|||
99 | b3 |
|
|||
100 | b4 |
|
|||
101 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
98 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
102 |
|
99 | |||
103 | Check for issue2642 |
|
100 | Check for issue2642 |
General Comments 0
You need to be logged in to leave comments.
Login now