From c71927873f1aeec872e845ba826ea33f11f5bd2b Mon Sep 17 00:00:00 2001 From: "koz@chromium.org" Date: Tue, 9 Apr 2013 23:28:46 +0000 Subject: [PATCH] Make warning for mismatched local and remote patchset more clear. Review URL: https://chromiumcodereview.appspot.com/13956002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@193257 0039d316-1c4b-4281-b951-d872f2087c98 --- git_cl.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git_cl.py b/git_cl.py index a4a160b02b..efed890002 100755 --- a/git_cl.py +++ b/git_cl.py @@ -1300,6 +1300,9 @@ def CMDupload(parser, args): print ('The last upload made from this repository was patchset #%d but ' 'the most recent patchset on the server is #%d.' % (local_patchset, latest_patchset)) + print ('Uploading will still work, but if you\'ve uploaded to this issue ' + 'from another machine or branch the patch you\'re uploading now ' + 'might not include those changes.') ask_for_data('About to upload; enter to confirm.') print_stats(options.similarity, options.find_copies, args)