From 2bdadf1e0d54eb09c2dfe7c2fa957b24061b6a21 Mon Sep 17 00:00:00 2001 From: tandrii Date: Tue, 12 Jul 2016 12:27:54 -0700 Subject: [PATCH] git cl upload: remove no longer aplicable message. R=andybons@chromium.org BUG= Review-Url: https://codereview.chromium.org/2143693002 --- git_cl.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/git_cl.py b/git_cl.py index 1a151c7b00..56c0ff7718 100755 --- a/git_cl.py +++ b/git_cl.py @@ -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()