diff options
| author |  Yuqian Li <liyuqian@google.com> | 2017-11-06 17:46:40 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-07 14:25:18 +0000 |
| commit | 427293c17ee807d014158990770a6efad9a9a4e6 (patch) | |
| tree | d0b7af21a015ba61f30a35d38a04ba7652c3f9fd /tools | |
| parent | 57eea942a671793b91373e79558a35e7df4e6082 (diff) | |
Update chromium codebase during add_legacy_flag.py
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/rebaseline/add_legacy_flag.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/rebaseline/add_legacy_flag.py b/tools/rebaseline/add_legacy_flag.py index 8a99e517b6..9ccfd8cad7 100644 --- a/tools/rebaseline/add_legacy_flag.py +++ b/tools/rebaseline/add_legacy_flag.py @@ -66,6 +66,10 @@ def add_to_chromium(args): subprocess.check_call(['git', 'stash', 'pop']) 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. # We'll delete the branch in the end. random = randint(1, 10000) |