Continue to the next file after a conflict in apply_patch.

Continue to the next file after a conflict in apply_patch.

BUG=658915
Committed: https://chromium.googlesource.com/chromium/tools/depot_tools/+/2f3f137de7a627772cd37801530a4ce6458c5d81

[skobes, 2016-10-25 02:36:13]

The CQ bit was checked by skobes@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-10-25 02:36:20]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-25 02:38:10]

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

[commit-bot: I haz the power, 2016-10-25 02:38:11]

Dry run: Try jobs failed on following builders:
  Depot Tools Presubmit on luci.infra.try (JOB_FAILED,
https://luci-milo.appspot.com/swarming/task/321284b16daa5d10)

[skobes, 2016-10-25 02:46:30]

Patchset #1 (id:1) has been deleted

[skobes, 2016-10-25 02:46:35]

Patchset #1 (id:20001) has been deleted

[skobes, 2016-10-25 02:46:42]

The CQ bit was checked by skobes@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-10-25 02:46:51]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-25 02:49:40]

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

[commit-bot: I haz the power, 2016-10-25 02:49:41]

Dry run: This issue passed the CQ dry run.

[skobes, 2016-10-25 02:55:10]

Description was changed from

==========
Collect multiple failures.

BUG=658915
==========

to

==========
Continue to the next file after a conflict in apply_patch.

BUG=658915
==========

[skobes, 2016-10-25 02:56:10]

skobes@chromium.org changed reviewers:
+ tandrii@chromium.org

[tandrii(chromium), 2016-10-25 09:52:44]

lgtm

https://codereview.chromium.org/2446013002/diff/40001/checkout.py
File checkout.py (right):

https://codereview.chromium.org/2446013002/diff/40001/checkout.py#newcode88
checkout.py:88: (p, status) = e
nit: no need for ()

[skobes, 2016-10-25 15:05:25]

https://codereview.chromium.org/2446013002/diff/40001/checkout.py
File checkout.py (right):

https://codereview.chromium.org/2446013002/diff/40001/checkout.py#newcode88
checkout.py:88: (p, status) = e
On 2016/10/25 09:52:44, tandrii(chromium) wrote:
> nit: no need for ()

Done.

[skobes, 2016-10-25 15:05:29]

The CQ bit was checked by skobes@chromium.org

[skobes, 2016-10-25 15:05:29]

The patchset sent to the CQ was uploaded after l-g-t-m from tandrii@chromium.org
Link to the patchset: https://codereview.chromium.org/2446013002/#ps60001
(title: "address nit")

[commit-bot: I haz the power, 2016-10-25 15:05:34]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-25 15:08:30]

Description was changed from

==========
Continue to the next file after a conflict in apply_patch.

BUG=658915
==========

to

==========
Continue to the next file after a conflict in apply_patch.

BUG=658915

Committed:
https://chromium.googlesource.com/chromium/tools/depot_tools/+/2f3f137de7a627...
==========

[commit-bot: I haz the power, 2016-10-25 15:08:31]

Committed patchset #2 (id:60001) as
https://chromium.googlesource.com/chromium/tools/depot_tools/+/2f3f137de7a627...