git cl upload: remove no longer aplicable message.

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

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

Loading…
Cancel
Save