equal
deleted
inserted
replaced
546 commitmsg=commitmsg, |
546 commitmsg=commitmsg, |
547 editor=editor, |
547 editor=editor, |
548 user=ctx.user(), |
548 user=ctx.user(), |
549 date=date, |
549 date=date, |
550 ) |
550 ) |
551 mergestatemod.mergestate.clean(repo) |
|
552 else: |
551 else: |
553 newnode = commitnode( |
552 newnode = commitnode( |
554 repo, |
553 repo, |
555 extra=extra, |
554 extra=extra, |
556 commitmsg=commitmsg, |
555 commitmsg=commitmsg, |
1087 _( |
1086 _( |
1088 b'hit merge conflicts; re-running rebase without in-memory' |
1087 b'hit merge conflicts; re-running rebase without in-memory' |
1089 b' merge\n' |
1088 b' merge\n' |
1090 ) |
1089 ) |
1091 ) |
1090 ) |
1092 # TODO: Make in-memory merge not use the on-disk merge state, so |
|
1093 # we don't have to clean it here |
|
1094 mergestatemod.mergestate.clean(repo) |
|
1095 clearstatus(repo) |
1091 clearstatus(repo) |
1096 clearcollapsemsg(repo) |
1092 clearcollapsemsg(repo) |
1097 return _dorebase(ui, repo, action, opts, inmemory=False) |
1093 return _dorebase(ui, repo, action, opts, inmemory=False) |
1098 else: |
1094 else: |
1099 return _dorebase(ui, repo, action, opts) |
1095 return _dorebase(ui, repo, action, opts) |