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

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

Previously we just added an assert here but better
to simply succeed in this case, while outputting
the intial failure message.

BUG=425696
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=292687

[Sam Clegg, 2014-10-22 23:57:49]

sbc@chromium.org changed reviewers:
+ iannucci@chromium.org

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

lgtm

https://codereview.chromium.org/667793005/diff/1/git_rebase_update.py
File git_rebase_update.py (right):

https://codereview.chromium.org/667793005/diff/1/git_rebase_update.py#newcode161
git_rebase_update.py:161: print rebase_ret.stderr
do we want to have a blurb to report this on the bug?

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

This change reduces coverage in this file to 97%.  Would you like to try and
concuct a test case for this using mocks somehow?  Or can I lower out
expectations?

https://codereview.chromium.org/667793005/diff/1/git_rebase_update.py
File git_rebase_update.py (right):

https://codereview.chromium.org/667793005/diff/1/git_rebase_update.py#newcode161
git_rebase_update.py:161: print rebase_ret.stderr
On 2014/10/23 00:42:07, iannucci wrote:
> do we want to have a blurb to report this on the bug?

Done.

[iannucci, 2014-10-24 21:15:46]

On 2014/10/24 20:01:24, Sam Clegg wrote:
> This change reduces coverage in this file to 97%.  Would you like to try and
> concuct a test case for this using mocks somehow?  Or can I lower out
> expectations?

for now you can add a `# pragma: no cover` to that statement, since we don't
know how to repro it. Once we do, we should add a real test.

> 
> https://codereview.chromium.org/667793005/diff/1/git_rebase_update.py
> File git_rebase_update.py (right):
> 
>
https://codereview.chromium.org/667793005/diff/1/git_rebase_update.py#newcode161
> git_rebase_update.py:161: print rebase_ret.stderr
> On 2014/10/23 00:42:07, iannucci wrote:
> > do we want to have a blurb to report this on the bug?
> 
> Done.

[iannucci, 2014-10-24 21:16:08]

(otherwise still lgtm)

[Sam Clegg, 2014-10-24 22:19:43]

The CQ bit was checked by sbc@chromium.org

[commit-bot: I haz the power, 2014-10-24 22:20:34]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/667793005/40001

[commit-bot: I haz the power, 2014-10-24 22:22:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-24 22:22:56]

Presubmit check for 667793005-40001 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
Pylint (106 files) (32.63s) failed
************* Module
/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_auto_svn.py
W0612: 86,2:main: Unused variable 'prefix'


Presubmit checks took 126.8s to calculate.

[Sam Clegg, 2014-10-25 00:58:07]

removed unused symbol to fix presubmit.

[Sam Clegg, 2014-10-27 18:39:35]

On 2014/10/25 00:58:07, Sam Clegg wrote:
> removed unused symbol to fix presubmit.

ptal, since I added a change to git_auto_svn.py to fix the presubmit.

[iannucci, 2014-10-27 19:50:07]

lgtm

[Sam Clegg, 2014-10-27 20:23:21]

The CQ bit was checked by sbc@chromium.org

[commit-bot: I haz the power, 2014-10-27 20:23:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/667793005/80001

[commit-bot: I haz the power, 2014-10-27 20:26:07]

Committed patchset #5 (id:80001) as 292687