git cl description leave unpublished edit if stop to modify description |
||||||
Issue description
$ git cl desc
Traceback (most recent call last):
File "/usr/local/google/home/tikuta/git/depot_tools/git_cl.py", line 5415, in <module>
sys.exit(main(sys.argv[1:]))
File "/usr/local/google/home/tikuta/git/depot_tools/git_cl.py", line 5397, in main
return dispatcher.execute(OptionParser(), argv)
File "/usr/local/google/home/tikuta/git/depot_tools/subcommand.py", line 252, in execute
return command(parser, args[1:])
File "/usr/local/google/home/tikuta/git/depot_tools/git_cl.py", line 3922, in CMDdescription
cl.UpdateDescription(description.description, force=options.force)
File "/usr/local/google/home/tikuta/git/depot_tools/git_cl.py", line 1531, in UpdateDescription
description, force=force)
File "/usr/local/google/home/tikuta/git/depot_tools/git_cl.py", line 2483, in UpdateDescriptionRemote
description)
File "/usr/local/google/home/tikuta/git/depot_tools/gerrit_util.py", line 610, in SetCommitMessage
ReadHttpResponse(conn, ignore_404=False)
File "/usr/local/google/home/tikuta/git/depot_tools/gerrit_util.py", line 373, in ReadHttpResponse
raise GerritError(response.status, reason)
gerrit_util.GerritError: Conflict: New commit message cannot be same as existing commit message
$ git cl desc
The description cannot be modified while the issue has a pending unpublished edit. Either publish the edit in the Gerrit web UI or delete it.
Press Enter to delete the unpublished edit, Ctrl+C to abort.
Is it better to not leave unpublished edit if same commit message were sent?
,
Dec 5 2016
,
Dec 5 2016
,
Dec 9 2016
,
Dec 9 2016
,
Dec 13 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/e9373d6e92957c70d9ccc5595c5dc0855fbb6a18 commit e9373d6e92957c70d9ccc5595c5dc0855fbb6a18 Author: Aaron Gable <agable@chromium.org> Date: Tue Dec 13 20:28:45 2016 Clean up after failed gerrit cl description edits If either the edit creation or edit publishing fail, we're left with an unpublished edit hanging around. This can result in a follow-up invocation of 'git cl desc' (e.g. if the user changes their mind, or retries) will also fail. So, clean up after ourselves. BUG= 671091 Change-Id: Icfe53996acf2555b82be0695a3c86ebb8c50b936 Reviewed-on: https://chromium-review.googlesource.com/418449 Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org> Commit-Queue: Aaron Gable <agable@chromium.org> [modify] https://crrev.com/e9373d6e92957c70d9ccc5595c5dc0855fbb6a18/gerrit_util.py
,
Dec 13 2016
,
Dec 14 2016
Thank you for fixing. |
||||||
►
Sign in to add a comment |
||||||
Comment 1 by tandrii@chromium.org
, Dec 5 2016Components: -Infra>Git Infra>Codereview>Gerrit Infra>SDK
Labels: Proj-Geri