D5213: narrow: fix copies._fullcopytracing() narrowspec filtering in graft case
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Nov 1 21:03:54 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG07a66c1387d1: narrow: fix copies._fullcopytracing() narrowspec filtering in graft case (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5213?vs=12371&id=12377
REVISION DETAIL
https://phab.mercurial-scm.org/D5213
AFFECTED FILES
mercurial/copies.py
tests/test-narrow-copies.t
CHANGE DETAILS
diff --git a/tests/test-narrow-copies.t b/tests/test-narrow-copies.t
--- a/tests/test-narrow-copies.t
+++ b/tests/test-narrow-copies.t
@@ -71,5 +71,4 @@
$ hg ci -Aqm 'add inside/f5'
$ hg --config extensions.rebase= rebase -d 'public()' -r .
rebasing 6:610b60178c28 "add inside/f5" (tip)
- abort: data/outside/f3.i at 54e53435331b: no match found!
- [255]
+ saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/610b60178c28-65716a78-rebase.hg
diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -511,8 +511,9 @@
# unmatched file from topological common ancestors (no DAG rotation)
# need to recompute this for directory move handling when grafting
mta = tca.manifest()
- u1u, u2u = _computenonoverlap(repo, c1, c2, m1.filesnotin(mta),
- m2.filesnotin(mta),
+ u1u, u2u = _computenonoverlap(repo, c1, c2,
+ m1.filesnotin(mta, repo.narrowmatch()),
+ m2.filesnotin(mta, repo.narrowmatch()),
baselabel='topological common ancestor')
for f in u1u:
To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list