Skip to content
Snippets Groups Projects
Commit 986d04b9 authored by Yuya Nishihara's avatar Yuya Nishihara
Browse files

rebase: remove extra "if" from check of collapsing named branches

parent d755a953
No related merge requests found
......@@ -386,14 +386,13 @@
if dest.closesbranch() and not keepbranchesf:
ui.status(_('reopening closed branch head %s\n') % dest)
if keepbranchesf:
if collapsef:
branches = set()
for rev in state:
branches.add(repo[rev].branch())
if len(branches) > 1:
raise error.Abort(_('cannot collapse multiple named '
'branches'))
if keepbranchesf and collapsef:
branches = set()
for rev in state:
branches.add(repo[rev].branch())
if len(branches) > 1:
raise error.Abort(_('cannot collapse multiple named '
'branches'))
# Rebase
if not targetancestors:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment