509 u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, |
509 u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, |
510 baselabel='base') |
510 baselabel='base') |
511 # unmatched file from topological common ancestors (no DAG rotation) |
511 # unmatched file from topological common ancestors (no DAG rotation) |
512 # need to recompute this for directory move handling when grafting |
512 # need to recompute this for directory move handling when grafting |
513 mta = tca.manifest() |
513 mta = tca.manifest() |
514 u1u, u2u = _computenonoverlap(repo, c1, c2, m1.filesnotin(mta), |
514 u1u, u2u = _computenonoverlap(repo, c1, c2, |
515 m2.filesnotin(mta), |
515 m1.filesnotin(mta, repo.narrowmatch()), |
|
516 m2.filesnotin(mta, repo.narrowmatch()), |
516 baselabel='topological common ancestor') |
517 baselabel='topological common ancestor') |
517 |
518 |
518 for f in u1u: |
519 for f in u1u: |
519 _checkcopies(c1, c2, f, base, tca, dirtyc1, limit, data1) |
520 _checkcopies(c1, c2, f, base, tca, dirtyc1, limit, data1) |
520 |
521 |