--- a/hgext/rebase.py Sat Dec 05 23:48:22 2015 +0900
+++ b/hgext/rebase.py Sat Dec 05 23:50:13 2015 +0900
@@ -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: