| Issue 2912: | Gerrit merges unrelated patches along with the one that was submitted! | |
| 2 people starred this issue and may be notified of changes. | Back to list |
************************************************************ ***** NOTE: THIS BUG TRACKER IS FOR GERRIT CODE REVIEW ***** ***** DO NOT SUBMIT BUGS FOR CHROME, ANDROID, INTERNAL ***** ***** ISSUES WITH YOUR COMPANY'S GERRIT SETUP, ETC. ***** ***** THOSE ISSUE BELONG IN DIFFERENT ISSUE TRACKERS! ***** ************************************************************ Affected Version: 2.7 What steps will reproduce the problem? 1. Submit a patch (it will be in "Merge pending" for quite some time) What is the expected output? What do you see instead? ** Expected output: ** Patch will be submitted and merged, no other patches will be submitted bypassing review. ** Observed output: ** Gerrit also merges unrelated patches which no one had yet approved/submitted, with the original patch. The unrelated patch will appear as In review, but will in fact propagate into master. The unrelated patches would also lack these tags: Reviewed-on: Reviewed-by: Reviewed-by: Tested-by: The logs weren't very helpful, and we couldn't catch the issue by ourselves.
Sep 18, 2014
#1
ygorsh...@smartlabs.tv
Sep 18, 2014
There was a problem with the merge strategies that was fixed in 2.8.3, although the description of that is not quite the same as the issue here. Are you sure the unrelated changes are actually merged into the repository, and not just marked as "merged" in the UI? https://gerrit-documentation.storage.googleapis.com/ReleaseNotes/ReleaseNotes-2.8.3.html
Status:
AwaitingInformation
Sep 18, 2014
No, I'm absolutely positive that these changes were propagated into the tree (well, at least the developers who have reported this bug said that); apparently, this has already caused breakage in our stable tree.
Sep 19, 2014
Additional info coming from our developers:
It seems that to reproduce the bug you have to have several patches on review, and then submit a patch that had a non-yet-merged patch in its dependencies ("Depends On").
Sep 29, 2014
This time it happened again. I'm attaching a screenshot. |
|
| ► Sign in to add a comment |