Show More
@@ -292,7 +292,7 b' def rebase(ui, repo, **opts):' | |||
|
292 | 292 | else: |
|
293 | 293 | commitmsg = 'Collapsed revision' |
|
294 | 294 | for rebased in state: |
|
295 |
if rebased not in skipped and state[rebased] |
|
|
295 | if rebased not in skipped and state[rebased] > nullmerge: | |
|
296 | 296 | commitmsg += '\n* %s' % repo[rebased].description() |
|
297 | 297 | commitmsg = ui.edit(commitmsg, repo.ui.username()) |
|
298 | 298 | newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg, |
@@ -305,7 +305,7 b' def rebase(ui, repo, **opts):' | |||
|
305 | 305 | # Nodeids are needed to reset bookmarks |
|
306 | 306 | nstate = {} |
|
307 | 307 | for k, v in state.iteritems(): |
|
308 |
if v |
|
|
308 | if v > nullmerge: | |
|
309 | 309 | nstate[repo[k].node()] = repo[v].node() |
|
310 | 310 | |
|
311 | 311 | if not keepf: |
@@ -479,7 +479,7 b' def updatebookmarks(repo, nstate, origin' | |||
|
479 | 479 | marks = repo._bookmarks |
|
480 | 480 | for k, v in originalbookmarks.iteritems(): |
|
481 | 481 | if v in nstate: |
|
482 |
if nstate[v] |
|
|
482 | if nstate[v] > nullmerge: | |
|
483 | 483 | # update the bookmarks for revs that have moved |
|
484 | 484 | marks[k] = nstate[v] |
|
485 | 485 | |
@@ -497,7 +497,7 b' def storestatus(repo, originalwd, target' | |||
|
497 | 497 | f.write('%d\n' % int(keepbranches)) |
|
498 | 498 | for d, v in state.iteritems(): |
|
499 | 499 | oldrev = repo[d].hex() |
|
500 |
if v |
|
|
500 | if v > nullmerge: | |
|
501 | 501 | newrev = repo[v].hex() |
|
502 | 502 | else: |
|
503 | 503 | newrev = v |
@@ -679,7 +679,7 b' def clearrebased(ui, repo, state, skippe' | |||
|
679 | 679 | if markers: |
|
680 | 680 | obsolete.createmarkers(repo, markers) |
|
681 | 681 | else: |
|
682 |
rebased = [rev for rev in state if state[rev] |
|
|
682 | rebased = [rev for rev in state if state[rev] > nullmerge] | |
|
683 | 683 | if rebased: |
|
684 | 684 | stripped = [] |
|
685 | 685 | for root in repo.set('roots(%ld)', rebased): |
General Comments 0
You need to be logged in to leave comments.
Login now