Mercurial > hg-stable
changeset 27975:6f92d6bd2972 stable
rebase: backout changeset 986d04b9fedd
This is a dependency for a future backout of 88fde8db5307.
See the previous patches for why.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 03 Feb 2016 09:23:52 -0800 |
| parents | bb14a81ce647 |
| children | 8f4d3eeb5198 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Wed Feb 03 09:06:52 2016 -0800 +++ b/hgext/rebase.py Wed Feb 03 09:23:52 2016 -0800 @@ -397,13 +397,14 @@ if dest.closesbranch() and not keepbranchesf: ui.status(_('reopening closed branch head %s\n') % dest) - 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')) + 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')) # Rebase if not targetancestors: