aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git cl upload: remove no longer aplicable message.

Browse Source 
R=andybons@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2143693002
changes/90/365990/1
tandrii 9 years ago committed by Commit bot
parent 45f10aecb5
commit 2bdadf1e0d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File

5
git_cl.py
Unescape Escape View File

@ -2483,11 +2483,10 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
# Gerrit will create additional CLs when uploading. # Gerrit will create additional CLs when uploading.
if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) != if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
RunGitSilent(['rev-parse', parent + ':'])): RunGitSilent(['rev-parse', parent + ':'])):
# TODO(tandrii): remove "old depot_tools" part on April 12, 2016.
DieWithError( DieWithError(
'Upload upstream branch %s first.\n' 'Upload upstream branch %s first.\n'
'Note: maybe you\'ve uploaded it with --no-squash or with an old ' 'Note: maybe you\'ve uploaded it with --no-squash. '
'version of depot_tools. If so, then re-upload it with:\n' 'If so, then re-upload it with:\n'
' git cl upload --squash\n' % upstream_branch_name) ' git cl upload --squash\n' % upstream_branch_name)
else: else:
parent = self.GetCommonAncestorWithUpstream() parent = self.GetCommonAncestorWithUpstream()

Write Preview
Loading…
Cancel
Save