Show More
@@ -42,7 +42,7 b' def _findoldnames(fctx, limit):' | |||||
42 | seen.add(s) |
|
42 | seen.add(s) | |
43 | if fc.path() != orig and fc.path() not in old: |
|
43 | if fc.path() != orig and fc.path() not in old: | |
44 | old[fc.path()] = (depth, fc.path()) # remember depth |
|
44 | old[fc.path()] = (depth, fc.path()) # remember depth | |
45 |
if |
|
45 | if fc.rev() is not None and fc.rev() < limit: | |
46 | continue |
|
46 | continue | |
47 | visit += [(p, depth - 1) for p in fc.parents()] |
|
47 | visit += [(p, depth - 1) for p in fc.parents()] | |
48 |
|
48 |
@@ -288,7 +288,7 b' def applyupdates(repo, action, wctx, mct' | |||||
288 | continue |
|
288 | continue | |
289 | f2, fd, flags, move = a[2:] |
|
289 | f2, fd, flags, move = a[2:] | |
290 | r = ms.resolve(fd, wctx, mctx) |
|
290 | r = ms.resolve(fd, wctx, mctx) | |
291 | if r > 0: |
|
291 | if r is not None and r > 0: | |
292 | unresolved += 1 |
|
292 | unresolved += 1 | |
293 | else: |
|
293 | else: | |
294 | if r is None: |
|
294 | if r is None: |
General Comments 0
You need to be logged in to leave comments.
Login now