| Issue 1985: | %base feature keeps changes in "Submitted, Merge Pending" status after the submit to master | |
| 3 people starred this issue and may be notified of changes. | Back to list |
Affected Version: 2.7-rc1 What steps will reproduce the problem? 1. Push changes to e.g. tmp/mybranch 2. Push to master with %base (git push origin HEAD:refs/for/master%base=B) 3. "Submit" changes from the Web-UI 4. You can see the changes on master, but the Web-UI status still shows: "Submitted, Merge Pending" What is the expected output? What do you see instead? Status should be "Merged" %base feature introduced in: https://gerrit-review.googlesource.com/#/c/44850/
Jul 2, 2013
#1
dborowitz@google.com
Labels:
Blocking-2.7
Jul 2, 2013
There is often an error in the logs when merge fails and a change gets stuck in the submitted state; do you see anything in your logs?
Jul 16, 2013
It turns out %base is subtly broken in a variety of ways. I have a workaround that will at least allow you to get out of this bad state, but a complete fix is going to take a while.
Aug 16, 2013
As I implied in my last message the scope of the fix is beyond what we can do in time for 2.7, and this is technically not a regression since the %base feature has been broken since its introduction in 2.6 :(
Labels:
-Blocking-2.7
Apr 15, 2014
I'm considering using Gerrit and I will want to use %base. Can you please elaborate a little on how this feature is broken, how to work around any issues, and what is the cause of the problem in this ticket? The documentation from 2.9-rc1 [1] does not warn about any problems. [1] https://gerrit-review.googlesource.com/Documentation/user-upload.html#base |
|
| ► Sign in to add a comment |