git_cl.py - Issue 13956002: Make warning for mismatched local and remote patchset more clear.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git_cl.py

Issue 13956002: Make warning for mismatched local and remote patchset more clear. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: git_cl.py

diff --git a/git_cl.py b/git_cl.py

index a4a160b02beac11ba5c7477d84ca559e558c30f6..efed890002830f732528f23c25d686d96cb43bf7 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)

« no previous file with comments | « no previous file | no next file » | no next file with comments »