Handle unusual case in rebase-update where second attempt works.

git_rebase_update.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Tool to update all branches to have the latest changes from their upstreams.
 """
 
 import argparse
@@ skipping 130 matching lines @@
       # Try to rebase the branch_squash_attempt branch to see if it's empty.
       squash_ret = git.rebase(parent, start_hash, squash_branch, abort=True)
       empty_rebase = git.hash_one(squash_branch) == git.hash_one(parent)
       git.run('checkout', branch)
       git.run('branch', '-D', squash_branch)
       if squash_ret.success and empty_rebase:
         print 'Success!'
         git.squash_current_branch(merge_base=start_hash)
         git.rebase(parent, start_hash, branch)
       else:
+        print "Failed!"
+        print
+
         # rebase and leave in mid-rebase state.
         # This second rebase attempt should always fail in the same
         # way that the first one does.  If it magically succeeds then
         # something very strange has happened.
         second_rebase_ret = git.rebase(parent, start_hash, branch)
-        assert(not second_rebase_ret.success)
-        print "Failed!"
-        print
-        print "Here's what git-rebase (squashed) had to say:"
-        print
-        print squash_ret.stdout
-        print squash_ret.stderr
-        print textwrap.dedent(
-        """\
-        Squashing failed. You probably have a real merge conflict.
+        if second_rebase_ret.success:
+          print "Second rebase succeeded.  First one failed with:"
+          print rebase_ret.stderr

[iannucci, 2014/10/23 00:42:07]

do we want to have a blurb to report this on the bug?

[Sam Clegg, 2014/10/24 20:01:24]

Done.

+        else:
+          print "Here's what git-rebase (squashed) had to say:"
+          print
+          print squash_ret.stdout
+          print squash_ret.stderr
+          print textwrap.dedent(
+          """\
+          Squashing failed. You probably have a real merge conflict.
 
-        Your working copy is in mid-rebase. Either:
-         * completely resolve like a normal git-rebase; OR
-         * abort the rebase and mark this branch as dormant:
-               git config branch.%s.dormant true
+          Your working copy is in mid-rebase. Either:
+           * completely resolve like a normal git-rebase; OR
+           * abort the rebase and mark this branch as dormant:
+                 git config branch.%s.dormant true
 
-        And then run `git rebase-update` again to resume.
-        """ % branch)
-        return False
+          And then run `git rebase-update` again to resume.
+          """ % branch)
+          return False
   else:
     print '%s up-to-date' % branch
 
   git.remove_merge_base(branch)
   git.get_or_create_merge_base(branch)
 
   return True
 
 
 def main(args=()):
@@ skipping 73 matching lines @@
           % (return_branch, root_branch)
         )
       git.run('checkout', root_branch)
     git.set_config(STARTING_BRANCH_KEY, '')
 
   return retcode
 
 
 if __name__ == '__main__':  # pragma: no cover
   sys.exit(main(sys.argv[1:]))