##// END OF EJS Templates
narrow: fix copies._fullcopytracing() narrowspec filtering in graft case...
Martin von Zweigbergk -
r40489:07a66c13 stable
parent child Browse files
Show More
@@ -511,8 +511,9 def _fullcopytracing(repo, c1, c2, 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:
@@ -71,5 +71,4 create full repo
71 $ hg ci -Aqm 'add inside/f5'
71 $ hg ci -Aqm 'add inside/f5'
72 $ hg --config extensions.rebase= rebase -d 'public()' -r .
72 $ hg --config extensions.rebase= rebase -d 'public()' -r .
73 rebasing 6:610b60178c28 "add inside/f5" (tip)
73 rebasing 6:610b60178c28 "add inside/f5" (tip)
74 abort: data/outside/f3.i@54e53435331b: no match found!
74 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/610b60178c28-65716a78-rebase.hg
75 [255]
General Comments 0
You need to be logged in to leave comments. Login now