From d8c84597ce635d46a9ea7326a64f1a36a6afe70a Mon Sep 17 00:00:00 2001 From: Gavin Mak Date: Wed, 17 Nov 2021 18:56:51 +0000 Subject: [PATCH] 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 Reviewed-by: Josip Sokcevic Reviewed-by: Anthony Polito --- gclient_scm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gclient_scm.py b/gclient_scm.py index d79f07e92..92b725ab2 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -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']) + '--keep-redundant-commits', '--strategy=ort']) except subprocess2.CalledProcessError as e: self.Print('Failed to apply patch.')