diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 21:17:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 21:17:18 +0000 |
commit | 3c0fcaf157c060979b09c0d8e7a982ff5d1acdab (patch) | |
tree | f592e7ccc058bdd6c0beda99a104df4f73c5e1d3 /llvm_tools/patch_manager.py | |
parent | eef05f06e8d4f7d4b4df22a398fba3af34fd27a6 (diff) | |
parent | cfb8763e2bfd3fbba55c880a2858b8c73a1cd3ad (diff) | |
download | toolchain-utils-3c0fcaf157c060979b09c0d8e7a982ff5d1acdab.tar.gz |
Merging 8 commit(s) from Chromium's toolchain-utils am: 928fba9d74 am: cfb8763e2b
Change-Id: Id8b0ba2600fa220974d0f116efaa990580387d18
Diffstat (limited to 'llvm_tools/patch_manager.py')
-rwxr-xr-x | llvm_tools/patch_manager.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/llvm_tools/patch_manager.py b/llvm_tools/patch_manager.py index 82a73ed8..3c83fa96 100755 --- a/llvm_tools/patch_manager.py +++ b/llvm_tools/patch_manager.py @@ -95,6 +95,13 @@ def GetCommandLineArgs(): 'bisecting a patch (default: %(default)s) - only used for ' '"bisect_patches"') + # Trust src_path HEAD and svn_version. + parser.add_argument( + '--use_src_head', + action='store_true', + help='Use the HEAD of src_path directory as is, not necessarily the same ' + 'as the svn_version of upstream.') + # Add argument for the LLVM version to use for patch management. parser.add_argument( '--svn_version', @@ -718,8 +725,9 @@ def main(): # patches that fail to apply could successfully apply if HEAD's SVN version # was the same as 'svn_version'. In other words, HEAD's git hash should be # what is being updated to (e.g. LLVM_NEXT_HASH). - VerifyHEADIsTheSameAsSVNVersion(args_output.src_path, - args_output.svn_version) + if not args_output.use_src_head: + VerifyHEADIsTheSameAsSVNVersion(args_output.src_path, + args_output.svn_version) else: # `git bisect run` called this script. # |