##// END OF EJS Templates
copies: group bothnew with other sets
Matt Mackall -
r26659:df66736a default
parent child Browse files
Show More
@@ -323,9 +323,11 b' def mergecopies(repo, c1, c2, ca):'
323 fullcopy1, fullcopy2 = {}, {}
323 fullcopy1, fullcopy2 = {}, {}
324 diverge = {}
324 diverge = {}
325
325
326 # find interesting file sets from manifests
326 addedinm1 = m1.filesnotin(ma)
327 addedinm1 = m1.filesnotin(ma)
327 addedinm2 = m2.filesnotin(ma)
328 addedinm2 = m2.filesnotin(ma)
328 u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
329 u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
330 bothnew = sorted(addedinm1 & addedinm2)
329
331
330 for f in u1:
332 for f in u1:
331 checkcopies(c1, f, m1, m2, ca, limit, diverge, copy1, fullcopy1)
333 checkcopies(c1, f, m1, m2, ca, limit, diverge, copy1, fullcopy1)
@@ -351,7 +353,6 b' def mergecopies(repo, c1, c2, ca):'
351 else:
353 else:
352 divergeset.update(fl) # reverse map for below
354 divergeset.update(fl) # reverse map for below
353
355
354 bothnew = sorted(addedinm1 & addedinm2)
355 if bothnew:
356 if bothnew:
356 repo.ui.debug(" unmatched files new in both:\n %s\n"
357 repo.ui.debug(" unmatched files new in both:\n %s\n"
357 % "\n ".join(bothnew))
358 % "\n ".join(bothnew))
General Comments 0
You need to be logged in to leave comments. Login now