New issue
Advanced search Search tips

Issue 658915 link

Starred by 1 user
Status: Fixed
Owner:
skobes@chromium.org
Closed: Oct 2016
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Bug



Sign in to add a comment

[depot_tools] apply_issue (and now git cl patch) skips remaining files after first conflict

Project Member Reported by skobes@chromium.org, Oct 24 2016 
The apply_issue tool loops over files in a patchset invoking "git apply" separately for each file, and aborts immediately if any file has a conflict.

This makes it hard to use: after manually resolving the conflict, some subset of the patchset remains unapplied.

Since landing the fix for  issue 557512 , this issue affects "git cl patch" as well.
Project Member

Comment 1 by bugdroid1@chromium.org, Oct 25 2016 

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/2f3f137de7a627772cd37801530a4ce6458c5d81

commit 2f3f137de7a627772cd37801530a4ce6458c5d81
Author: skobes <skobes@chromium.org>
Date: Tue Oct 25 15:08:27 2016

Continue to the next file after a conflict in apply_patch.

BUG= 658915 

Review-Url: https://codereview.chromium.org/2446013002

[modify] https://crrev.com/2f3f137de7a627772cd37801530a4ce6458c5d81/checkout.py

Comment 2 by skobes@chromium.org, Oct 25 2016

Status: Fixed (was: Started)
►

Sign in to add a comment