My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 2322: All changes appear with status "Merge Conflict"
3 people starred this issue and may be notified of changes. Back to list
Status:  Released
Owner:  ----
Closed:  Jan 2014


Sign in to add a comment
 
Reported by org...@gmail.com, Dec 9, 2013
Affected Version: 2.9

When Cherry-Pick strategy is used.


Dec 9, 2013
#1 org...@gmail.com
Actually it doesn't seem to be related to the strategy. It happens right after upgrading from 2.7 to 2.9.

Changes that are updated after this upgrade are ok.
Dec 9, 2013
Project Member #2 edwin.ke...@gmail.com
Yes, it is a known issue that after an upgrade the mergeability information in the database may be stale for old changes. The mergeability flag for open changes will be automatically recomputed as soon as there is any change to the destination branch or with latest master when the submit type of the project is changes forth and back.

The idea is to fix this by updating the mergeability flags when reindex is run:
  https://gerrit-review.googlesource.com/52476 
Dec 10, 2013
Project Member #3 edwin.ke...@gmail.com
(No comment was entered for this change.)
Labels: Blocking-2.9
Jan 10, 2014
Project Member #4 edwin.ke...@gmail.com
(No comment was entered for this change.)
Status: Submitted
Labels: -Blocking-2.9 FixedIn-2.9
Apr 30, 2014
Project Member #5 dougk....@gmail.com
I just tested another upgrade from 2.8->2.9rc, ensuring that the change referenced was included in my build.  Unfortunately, the problem still occurred.  Anyone have any advice where to look next, or additional troubleshooting steps I should take?
May 1, 2014
Project Member #6 edwin.ke...@gmail.com
Did you run reindex with --recheck-mergeable?
For the upgrade to 2.9 you need to run this once to update the is mergeable information for all changes.

https://gerrit-review.googlesource.com/Documentation/pgm-reindex.html
May 2, 2014
Project Member #7 dougk....@gmail.com
Ah, that was it. :)  Should we include this either in the release notes or the "run reindex" notice on upgrade?  I would suppose release notes are probably the best place--I'll post a small patch.
May 2, 2014
Project Member #8 dougk....@gmail.com
Never mind. It's there.  Oops!
Jul 18, 2014
Project Member #9 edwin.ke...@gmail.com
(No comment was entered for this change.)
Status: Released
Sign in to add a comment

Powered by Google Project Hosting