diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 23:08:11 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 23:08:11 +0000 |
| commit | fb513f28726df58f421427030210fa8c95bc7940 (patch) | |
| tree | d02bfa723b36562cbfc57c866b7159a2a53e42a6 /tools | |
| parent | 1683aedf6b21b0dd55f1f4819e2b204e0b28be00 (diff) | |
| download | chromium_src-fb513f28726df58f421427030210fa8c95bc7940.zip chromium_src-fb513f28726df58f421427030210fa8c95bc7940.tar.gz chromium_src-fb513f28726df58f421427030210fa8c95bc7940.tar.bz2 | |
sync-webkit-git: a better message when you're not on the right branch
Review URL: http://codereview.chromium.org/235056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/sync-webkit-git.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/sync-webkit-git.py b/tools/sync-webkit-git.py index 41a4a15..01d408a 100755 --- a/tools/sync-webkit-git.py +++ b/tools/sync-webkit-git.py @@ -63,9 +63,10 @@ def UpdateCurrentCheckoutIfAppropriate(): """Reset the current gclient branch if that's what we have checked out.""" branch = RunGit(['symbolic-ref', '-q', 'HEAD']) if branch != MAGIC_GCLIENT_BRANCH: - print ("third_party/WebKit has some other branch ('%s') checked out." % - branch) - print "Run 'git checkout gclient' to put this under control of gclient." + print "We have now updated the 'gclient' branch, but third_party/WebKit" + print "has some other branch ('%s') checked out." % branch + print "Run 'git checkout gclient' under third_party/WebKit if you want" + print "to switch it to the version requested by DEPS." return if subprocess.call(['git', 'diff-index', '--exit-code', '--shortstat', |