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