Commit 804165b4 authored by Josip Sokcevic's avatar Josip Sokcevic Committed by LUCI CQ

Revert "Use ort strategy when applying patch"

This reverts commit d8c84597.

Reason for revert: breaks skiabuildbot, crbug.com/1273642

Original change's description:
> Use ort strategy when applying patch
>
> ort is faster and fixes bugs in recursive strategy.
>
> Bug: 1260085
> Change-Id: Ib8523d45da5cb0beea957b6ab706101d55bdc1f8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3276506
> Commit-Queue: Anthony Polito <apolito@google.com>
> Reviewed-by: Josip Sokcevic <sokcevic@google.com>
> Reviewed-by: Anthony Polito <apolito@google.com>

Bug: 1260085
Bug: 1273642
Change-Id: Iece472547549363733fd2fa8fe5240d39df744a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3307500
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
parent 512ca5c3
......@@ -432,7 +432,7 @@ class GitWrapper(SCMWrapper):
# in the tree.
# We pass '--keep-redundant-commits' to ignore those changes.
self._Capture(['cherry-pick', target_rev + '..' + patch_rev,
'--keep-redundant-commits', '--strategy=ort'])
'--keep-redundant-commits'])
except subprocess2.CalledProcessError as e:
self.Print('Failed to apply patch.')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment