On Thu, Jul 21, 2011 at 13:24, Paul Sokolovsky paul.sokolovsky@linaro.org wrote:
I have following scenario:
- Submitted a change for branch X to Gerrit.
- In the meantime, I also created a personal branch Y in the same
repository for integration testing. 3. Once that branch Y is pushed into Gerrit, the original change (still designated for branch X) is closed as "Merged", with comment added "Change has been successfully pushed into branch Y."
For me, this is not expected behavior - the change isn't merged, until it lands into the designated branch, personal development branches and stuff don't count.
So, is this expected behavior from Gerrit (2.2.1), does it always work this way, or can it be configured to be branch-strict, and if no, what are recommendations and best practices for manual/automated integration testing of changes?
I thought we fixed this. Maybe its only fixed in "master" and hasn't been released yet?
The old logic matched on Change-Id alone, and allowed a change to be closed if that Change-Id was pushed into any branch. IIRC current master matches on Change-Id *AND* branch pair, so pushing a commit with the same Change-Id into a different branch won't close the open change.