Issue 2244: Change with path conflict ends in "Submitted, merge pending status
Status:  Released
Owner: ----
Closed:  Nov 2013
Project Member Reported by dougk....@gmail.com, Nov 6, 2013
Affected Version: Tested on 2.7

What steps will reproduce the problem?
1. Submit two changes for review that modify the same line (a dependency here is good)
2. Review the second change and submit it.  This should cause a path conflict error.
3. Hit the submit button a second time.  No error will be displayed, but the change will be in merge pending status.

What is the expected output? What do you see instead?
Change should not be stuck in merge pending (and should display the same path conflict error).  For some reason, the second time the submit button is pressed, it doesn't display this error and ends up stuck in the merge queue regardless.

Nov 6, 2013
Project Member #1 edwin.ke...@gmail.com
Actually this is the expected behaviour unless you have the submit type set to Cherry-Pick. 'Submitted, Merge Pending' means this change is submitted (you clicked submit) but it cannot be merged yet because it has a dependency to a change that is still in review. If you submit this first change then the second change will be merged automatically.
Status: Invalid
Nov 7, 2013
Project Member #2 dougk....@gmail.com
Is it truly anticipated?  It seems inconsistent for an error to be returned to the user the first time, and the second time only, stick in merge-pending.  Also, yes, we do use the Cherry-Pick submit strategy.  I forgot to mention that in the initial report.
Nov 7, 2013
Project Member #3 edwin.ke...@gmail.com
If this is about the Cherry Pick submit strategy, then this is a bug. I believe here it is expected that on path conflict the change state should go back to "In Review'.
Status: Duplicate
Mergedinto: 1970
Nov 7, 2013
Project Member #4 dougk....@gmail.com
No, this doesn't follow the same exact case as Issue 1970, but there may be some relation.  Comment #7 there gets close, but note that I don't need to abandon the first change, and the issue only happens when I hit the submit button *twice*.  The first time works as anticipated.
Nov 7, 2013
Project Member #5 edwin.ke...@gmail.com
Ok, reopnening this issue then.
Status: New
Mergedinto:
Nov 7, 2013
Project Member #6 dougk....@gmail.com
Found the cause to be:
https://gerrit-review.googlesource.com/42392

I think a fix is available at:
https://gerrit-review.googlesource.com/51522
Nov 18, 2013
#7 sop@google.com
(No comment was entered for this change.)
Status: Submitted
Labels: FixedIn-2.6
Dec 9, 2013
Project Member #8 david.pu...@sonymobile.com
(No comment was entered for this change.)
Labels: -FixedIn-2.6 FixedIn-2.8
Dec 9, 2013
Project Member #9 david.pu...@sonymobile.com
(No comment was entered for this change.)
Status: Released