Show More
@@ -316,11 +316,11 b' class cg1unpacker(object):' | |||
|
316 | 316 | self.callback = progress.increment |
|
317 | 317 | |
|
318 | 318 | efilesset = set() |
|
319 |
|
|
|
319 | duprevs = [] | |
|
320 | 320 | |
|
321 | 321 | def ondupchangelog(cl, rev): |
|
322 | 322 | if rev < clstart: |
|
323 |
|
|
|
323 | duprevs.append(rev) | |
|
324 | 324 | |
|
325 | 325 | def onchangelog(cl, rev): |
|
326 | 326 | ctx = cl.changelogrevision(rev) |
@@ -448,8 +448,12 b' class cg1unpacker(object):' | |||
|
448 | 448 | if added: |
|
449 | 449 | phases.registernew(repo, tr, targetphase, added) |
|
450 | 450 | if phaseall is not None: |
|
451 | phases.advanceboundary(repo, tr, phaseall, cgnodes, revs=added) | |
|
452 | cgnodes = [] | |
|
451 | if duprevs: | |
|
452 | duprevs.extend(added) | |
|
453 | else: | |
|
454 | duprevs = added | |
|
455 | phases.advanceboundary(repo, tr, phaseall, [], revs=duprevs) | |
|
456 | duprevs = [] | |
|
453 | 457 | |
|
454 | 458 | if changesets > 0: |
|
455 | 459 |
General Comments 0
You need to be logged in to leave comments.
Login now