AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update chromium codebase during add_legacy_flag.py

Browse Source 
This would prevent a potential merge conflict.

Bug: skia:
Change-Id: Icb805ff41d491f021f3b12640084f743fda905aa
Reviewed-on: https://skia-review.googlesource.com/68140
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Yuqian Li <liyuqian@google.com>
This commit is contained in:
Yuqian Li 2017-11-06 17:46:40 -05:00 committed by Skia Commit-Bot
parent 57eea942a6
commit 427293c17e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/rebaseline/add_legacy_flag.py
View File

@ -66,6 +66,10 @@ def add_to_chromium(args):
subprocess.check_call(['git', 'stash', 'pop']) subprocess.check_call(['git', 'stash', 'pop'])
exit(1) exit(1)
# Update the repository to avoid conflicts
subprocess.check_call(['git', 'pull'])
subprocess.check_call(['gclient', 'sync']);
# Use random number to avoid branch name collision. # Use random number to avoid branch name collision.
# We'll delete the branch in the end. # We'll delete the branch in the end.
random = randint(1, 10000) random = randint(1, 10000)