Last modified: 2014-02-03 17:11:18 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 T53773, the corresponding Phabricator task for complete and up-to-date bug report information.
Bug 51773 - Weird behavior when cherry-picking a change from a branch to itself (to get rid of unnecessary unmerged dependencies)
Weird behavior when cherry-picking a change from a branch to itself (to get r...
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!
: upstream
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2013-07-21 15:04 UTC by Bartosz Dziewoński
Modified: 2014-02-03 17:11 UTC (History)
7 users (show)

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


Attachments

Description Bartosz Dziewoński 2013-07-21 15:04:48 UTC
Gerrit does weird stuff when cherry-picking a change from a branch to itself (to get rid of unnecessary unmerged dependencies). And if this is an unsupported use case, then it shouldn't be possible to do.

https://gerrit.wikimedia.org/r/#/c/74401/ used to depend on https://gerrit.wikimedia.org/r/#/c/74270/ (in PS1).

I used the "Cherry Pick To" function to cherry-pick it to master (it was already submitted to master), removing the "cherry picked from" line from the commit message.

Now PS2 it based directly on master's HEAD, but:

* There is no mention of PS2 being submitted in the comments section (only about PS1 being cherry-picked).

* It appears as if gerrit considered PS2's commiter to be TheDJ (PS1's commiter), not me.  (Yuvi's grrrit-wm reported: "[16:56] <grrrit-wm> (PS2) TheDJ: Tablesorter: Add testcase for unsortable column [core] - https://gerrit.wikimedia.org/r/74401" - ordinarily it reports actual authors of patchsets; I also vaguely recall seeing this in gerritmail send from some other changeset, but I don't have it handy right now).
Comment 1 Bartosz Dziewoński 2014-02-03 17:11:18 UTC
This appears to have been fixed with the upgrade to 2.8.1, I just did this on https://gerrit.wikimedia.org/r/#/c/110965/ and it was handled nicely.

Note You need to log in before you can comment on or make changes to this bug.


Navigation
Links