Improve message about why someone might want to use --force during `git cl patch`

Change-Id: I1c96164049513edb8e907928053b1eb09be2040f
Fixes:b/375594912
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5979029
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Auto-Submit: Joanna Wang <jojwang@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
changes/29/5979029/4
Joanna Wang 4 months ago committed by LUCI CQ
parent e951480e56
commit 9bf2a2011a

@ -2835,9 +2835,11 @@ class Changelist(object):
print('Committed patch for change %i patchset %i locally.' %
(parsed_issue_arg.issue, patchset))
print(
'Note: this created a local commit which does not have '
'the same hash as the one uploaded for review. This will make '
'uploading changes based on top of this branch difficult.\n'
'Note: this created a local commit on top of parent commit '
'that is different from the one in Gerrit. If the patched CL '
'is not yours and you cannot upload new patches to it, you '
'will not be able to upload stacked changes created on top of '
'this branch.\n'
'If you want to do that, use "git cl patch --force" instead.')
if self.GetBranch():

Loading…
Cancel
Save