This revision was automatically updated to reflect the committed changes.
Closed by commit rHG873f3682c8af: narrow: make copies.pathcopies() filter with 
narrowspec again (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5203?vs=12358&id=12367

REVISION DETAIL
  https://phab.mercurial-scm.org/D5203

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
@@ -62,5 +62,4 @@
   $ hg pull -q
   $ hg --config extensions.rebase= rebase -d tip
   rebasing 3:4f84b666728c "add inside/f4"
-  abort: data/outside/f3.i@54e53435331b: no match found!
-  [255]
+  saved backup bundle to 
$TESTTMP/narrow/.hg/strip-backup/4f84b666728c-4269b76e-rebase.hg
diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -219,6 +219,7 @@
 def _forwardcopies(a, b, match=None):
     """find {dst@b: src@a} copy mapping where a is an ancestor of b"""
 
+    match = a.repo().narrowmatch(match)
     # check for working copy
     if b.rev() is None:
         if a == b.p1():



To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to