gclient_scm: Try to rebase after printing what was wrong.

So we know why did git fail on the Chromium Windows trybots.

R=agable@chromium.org

Bug: 643346
Change-Id: Iac0abd9202fb56fbed6f3edf382b755e96fed3bf
Reviewed-on: https://chromium-review.googlesource.com/1031128
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

gclient_scm.py

@@ -357,11 +357,11 @@ class GitWrapper(SCMWrapper):
         # checkout + rebase.
         self._Capture(['rebase', base_rev])
       except subprocess2.CalledProcessError as e:
-        self._Capture(['rebase', '--abort'])
         self.Print('Failed to apply %r @ %r to %r at %r' % (
                 patch_repo, patch_ref, base_rev, self.checkout_path))
         self.Print('git returned non-zero exit status %s:\n%s' % (
             e.returncode, e.stderr))
+        self._Capture(['rebase', '--abort'])
         raise
     if options.reset_patch_ref:
       self._Capture(['reset', '--soft', base_rev])

recipes/trigger_recipe_roller.txt

@@ -5,6 +5,4 @@ Once upon a time, a budding web browser dev team needed a CI system.
 All they had was one poor machine under a desk, and its name was Batty,
 the Build and Test Yeti.
 
-
-
 😒