Show More
@@ -228,7 +228,10 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
228 | 228 | break |
|
229 | 229 | |
|
230 | 230 | # Compare manifests |
|
231 |
|
|
|
231 | visit = m1.iteritems() | |
|
232 | if repo.ui.debugflag: | |
|
233 | visit = sorted(visit) | |
|
234 | for f, n in visit: | |
|
232 | 235 | if partial and not partial(f): |
|
233 | 236 | continue |
|
234 | 237 | if f in m2: |
@@ -274,7 +277,10 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
274 | 277 | else: |
|
275 | 278 | act("other deleted", "r", f) |
|
276 | 279 | |
|
277 |
|
|
|
280 | visit = m2.iteritems() | |
|
281 | if repo.ui.debugflag: | |
|
282 | visit = sorted(visit) | |
|
283 | for f, n in visit: | |
|
278 | 284 | if partial and not partial(f): |
|
279 | 285 | continue |
|
280 | 286 | if f in m1 or f in copied: # files already visited |
General Comments 0
You need to be logged in to leave comments.
Login now