Show More
@@ -17,7 +17,6 b' from . import (' | |||||
17 | match as matchmod, |
|
17 | match as matchmod, | |
18 | node, |
|
18 | node, | |
19 | pathutil, |
|
19 | pathutil, | |
20 | scmutil, |
|
|||
21 | util, |
|
20 | util, | |
22 | ) |
|
21 | ) | |
23 | from .utils import ( |
|
22 | from .utils import ( | |
@@ -193,7 +192,7 b' def _committedforwardcopies(a, b, match)' | |||||
193 | # this comparison. |
|
192 | # this comparison. | |
194 | forwardmissingmatch = match |
|
193 | forwardmissingmatch = match | |
195 | if b.p1() == a and b.p2().node() == node.nullid: |
|
194 | if b.p1() == a and b.p2().node() == node.nullid: | |
196 |
filesmatcher = |
|
195 | filesmatcher = matchmod.exact(b.files()) | |
197 | forwardmissingmatch = matchmod.intersectmatchers(match, filesmatcher) |
|
196 | forwardmissingmatch = matchmod.intersectmatchers(match, filesmatcher) | |
198 | missing = _computeforwardmissing(a, b, match=forwardmissingmatch) |
|
197 | missing = _computeforwardmissing(a, b, match=forwardmissingmatch) | |
199 |
|
198 |
General Comments 0
You need to be logged in to leave comments.
Login now