Show More
@@ -219,6 +219,7 b' def _committedforwardcopies(a, b, match)' | |||||
219 | def _forwardcopies(a, b, match=None): |
|
219 | def _forwardcopies(a, b, match=None): | |
220 | """find {dst@b: src@a} copy mapping where a is an ancestor of b""" |
|
220 | """find {dst@b: src@a} copy mapping where a is an ancestor of b""" | |
221 |
|
221 | |||
|
222 | match = a.repo().narrowmatch(match) | |||
222 | # check for working copy |
|
223 | # check for working copy | |
223 | if b.rev() is None: |
|
224 | if b.rev() is None: | |
224 | if a == b.p1(): |
|
225 | if a == b.p1(): |
@@ -62,5 +62,4 b' create full repo' | |||||
62 | $ hg pull -q |
|
62 | $ hg pull -q | |
63 | $ hg --config extensions.rebase= rebase -d tip |
|
63 | $ hg --config extensions.rebase= rebase -d tip | |
64 | rebasing 3:4f84b666728c "add inside/f4" |
|
64 | rebasing 3:4f84b666728c "add inside/f4" | |
65 | abort: data/outside/f3.i@54e53435331b: no match found! |
|
65 | saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/4f84b666728c-4269b76e-rebase.hg | |
66 | [255] |
|
General Comments 0
You need to be logged in to leave comments.
Login now