Show More
@@ -386,14 +386,13 b' def rebase(ui, repo, **opts):' | |||||
386 | if dest.closesbranch() and not keepbranchesf: |
|
386 | if dest.closesbranch() and not keepbranchesf: | |
387 | ui.status(_('reopening closed branch head %s\n') % dest) |
|
387 | ui.status(_('reopening closed branch head %s\n') % dest) | |
388 |
|
388 | |||
389 | if keepbranchesf: |
|
389 | if keepbranchesf and collapsef: | |
390 | if collapsef: |
|
390 | branches = set() | |
391 | branches = set() |
|
391 | for rev in state: | |
392 | for rev in state: |
|
392 | branches.add(repo[rev].branch()) | |
393 | branches.add(repo[rev].branch()) |
|
393 | if len(branches) > 1: | |
394 | if len(branches) > 1: |
|
394 | raise error.Abort(_('cannot collapse multiple named ' | |
395 | raise error.Abort(_('cannot collapse multiple named ' |
|
395 | 'branches')) | |
396 | 'branches')) |
|
|||
397 |
|
396 | |||
398 | # Rebase |
|
397 | # Rebase | |
399 | if not targetancestors: |
|
398 | if not targetancestors: |
General Comments 0
You need to be logged in to leave comments.
Login now