rebase: backout changeset 986d04b9fedd

This is a dependency for a future backout of 88fde8db5307.

See the previous patches for why.

hgext/rebase.py

@@ -397,7 +397,8 b' def rebase(ui, repo, **opts):'
             if dest.closesbranch() and not keepbranchesf:
                 ui.status(_('reopening closed branch head %s\n') % dest)
 
-        if keepbranchesf and collapsef:
+        if keepbranchesf:
+            if collapsef:
             branches = set()
             for rev in state:
                 branches.add(repo[rev].branch())