Show More
@@ -302,7 +302,9 b' def mergecopies(repo, c1, c2, ca):' | |||
|
302 | 302 | else: |
|
303 | 303 | diverge2.update(fl) # reverse map for below |
|
304 | 304 | |
|
305 | bothnew = sorted([d for d in m1 if d in m2 and d not in ma]) | |
|
305 | addedinm1 = m1.filesnotin(ma) | |
|
306 | addedinm2 = m2.filesnotin(ma) | |
|
307 | bothnew = sorted(addedinm1 & addedinm2) | |
|
306 | 308 | if bothnew: |
|
307 | 309 | repo.ui.debug(" unmatched files new in both:\n %s\n" |
|
308 | 310 | % "\n ".join(bothnew)) |
General Comments 0
You need to be logged in to leave comments.
Login now