My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 1512: "Can Merge" says "No" when it should say "Yes"
3 people starred this issue and may be notified of changes. Back to list
Status:  New
Owner:  ----


Sign in to add a comment
 
Reported by cco3@android.com, Aug 7, 2012
I don't know how to reproduce, but patchset 1 of:
https://gerrit-review.googlesource.com/#/c/37280/
Is capable of merging yet "Can Merge" says "No".
Aug 21, 2012
#1 dashkov...@gmail.com
Same strange situation.
Commit A is based on commit B. B is merged into repository. No other dependences. Can merge say "NO".
In database in patch_set_ancestors sha1 of commit B for patchset A.
I have FF-only politics for target repo.
When I tests merge of this commit by hands, with --ff-only, all is merged.
I just change in gerrit DB in "changes.mergeable" to Y and submit patchset" button became available, and patchset was successfully merged.
I guess something wrong with MergeOp.
Aug 22, 2012
Project Member #2 david.pu...@sonymobile.com
The configuration of git-repo [1] is set to "Fast Forward Only", so I think this is the expected behaviour.  If a change is not based on the latest head, it can't be submitted until it is rebased.

[1] https://gerrit-review.googlesource.com/#/admin/projects/git-repo

Aug 23, 2012
Project Member #3 conl...@google.com
(No comment was entered for this change.)
Status: Invalid
Aug 23, 2012
#4 dashkov...@gmail.com
It was rebased. and when I push REBASE button, it says "up to date" on black screen.
Aug 23, 2012
Project Member #5 conl...@google.com
(No comment was entered for this change.)
Status: New
Aug 24, 2012
Project Member #6 edwin.ke...@gmail.com
I also saw this issue one or two times. "Can Merge" wrongly stated "No", it only recovered after another change was merged, which I guess cause the "Can Merge" flag to be recomputed. Unfortunately I also can't say how to reproduce this.
Sign in to add a comment

Powered by Google Project Hosting