Last modified: 2013-07-04 13:38:33 UTC

Wikimedia Bugzilla is closed!

Wikimedia migrated from Bugzilla to Phabricator. Bug reports are handled in Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See T52665, the corresponding Phabricator task for complete and up-to-date bug report information.
First Last Prev Next    This bug is not in your last search results.
Bug 50665 - Merging a gerrit change when attempting to push a new patch set
Merging a gerrit change when attempting to push a new patch set
Status: RESOLVED FIXED
Product: Wikimedia
Classification: Unclassified
Git/Gerrit (Other open bugs)
wmf-deployment
All All
: Unprioritized normal (vote)
: ---
Assigned To: Nobody - You can work on this!
:
Depends on:
Blocks:
  Show dependency tree / graph
 
Reported: 2013-07-03 14:58 UTC by Addshore
Modified: 2013-07-04 13:38 UTC (History)
4 users (show)

See Also:
Web browser: ---
Mobile Platform: ---
Assignee Huggle Beta Tester: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Description Addshore 2013-07-03 14:58:42 UTC 
When attempting to push patchset3 to https://gerrit.wikimedia.org/r/#/c/71610/ I somehow managed to unwittingly merge https://gerrit.wikimedia.org/r/#/c/58464/
When then trying to do the same the patchset was correctly pushed to gerrit.
Comment 1 Addshore 2013-07-03 15:01:08 UTC 
above I mean to refer to patchset4.
Comment 2 christian 2013-07-03 23:33:31 UTC 
It seems the accidental merge has already been reverted in:

  https://gerrit.wikimedia.org/r/#/c/71810/
Comment 3 Addshore 2013-07-04 07:59:34 UTC 
but should such a merge have even been possible?
Comment 4 christian 2013-07-04 13:38:33 UTC 
Yes, as you have Push permissions on that repository.

So you can push a commit directly to a ref on the repository (e.g.: master).
Gerrit notices that you updated the ref to include a commit that is still
pending for review, and sets that review to "Merged".
Looks correct to me.
Note You need to log in before you can comment on or make changes to this bug.
First Last Prev Next    This bug is not in your last search results.

Navigation
Links