Show More
@@ -87,6 +87,9 b' def rebase(ui, repo, **opts):' | |||||
87 | keepf = opts.get('keep', False) |
|
87 | keepf = opts.get('keep', False) | |
88 | keepbranchesf = opts.get('keepbranches', False) |
|
88 | keepbranchesf = opts.get('keepbranches', False) | |
89 | detachf = opts.get('detach', False) |
|
89 | detachf = opts.get('detach', False) | |
|
90 | # keepopen is not meant for use on the command line, but by | |||
|
91 | # other extensions | |||
|
92 | keepopen = opts.get('keepopen', False) | |||
90 |
|
93 | |||
91 | if contf or abortf: |
|
94 | if contf or abortf: | |
92 | if contf and abortf: |
|
95 | if contf and abortf: | |
@@ -181,7 +184,7 b' def rebase(ui, repo, **opts):' | |||||
181 |
|
184 | |||
182 | ui.note(_('rebase merging completed\n')) |
|
185 | ui.note(_('rebase merging completed\n')) | |
183 |
|
186 | |||
184 | if collapsef: |
|
187 | if collapsef and not keepopen: | |
185 | p1, p2 = defineparents(repo, min(state), target, |
|
188 | p1, p2 = defineparents(repo, min(state), target, | |
186 | state, targetancestors) |
|
189 | state, targetancestors) | |
187 | commitmsg = 'Collapsed revision' |
|
190 | commitmsg = 'Collapsed revision' |
General Comments 0
You need to be logged in to leave comments.
Login now