Patchwork [3,of,5,STABLE,emergency-fix] rebase: backout changeset 986d04b9fedd

login
register
mail settings
Submitter Siddharth Agarwal
Date Feb. 3, 2016, 5:26 p.m.
Message ID <e12fa0d903decb99d91a.1454520369@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/12954/
State Accepted
Headers show

Comments

Siddharth Agarwal - Feb. 3, 2016, 5:26 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1454520232 28800
#      Wed Feb 03 09:23:52 2016 -0800
# Branch stable
# Node ID e12fa0d903decb99d91abef3162fcb3bcf7747e7
# Parent  cc1e65b477a4eda2fac86cc7683794b7f5fd0de2
# Available At http://42.netv6.net/sid0-wip/hg/
#              hg pull http://42.netv6.net/sid0-wip/hg/ -r e12fa0d903de
rebase: backout changeset 986d04b9fedd

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

See the previous patches for why.

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -397,13 +397,14 @@  def rebase(ui, repo, **opts):
             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: