Hey all,
Fundraising uses deploy branches -- and this is a question about how to manage them via gerrit / git-review. Effectively -- what am I doing wrong that causes gerrit to reject my changes as exampled below:
Take for example CentralNotice (I created a test branch mwalker_test that was cloned from far back in the repo). If I follow the basic example of how I cherry pick a change into core, e.g.:
git fetch git checkout mwalker_test git cherry-pick 491b0dbb3ac01b4ebe6288cc5ea7e9aff6d49753 <-- a change beyond my current tip git review
gerrit tells me:
$ git cherry-pick 491b0dbb3ac01b4ebe6288cc5ea7e9aff6d49753 [mwalker_test 7016450] Add dependency to mobile module Author: jrobson jrobson@wikimedia.org 1 file changed, 1 insertion(+) $ git review remote: Resolving deltas: 100% (2/2) remote: Processing changes: refs: 1, done To ssh:// mwalker@gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice.git ! [remote rejected] HEAD -> refs/publish/master/mwalker_test (change 59546 closed) error: failed to push some refs to 'ssh:// mwalker@gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice.git'
Say what!? The mystery further deepens when I do a straight up merge:
$git merge master ... $ git review remote: Processing changes: refs: 1, done To ssh:// mwalker@gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice.git ! [remote rejected] HEAD -> refs/publish/master/mwalker_test (no new changes) error: failed to push some refs to 'ssh:// mwalker@gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice.git'
Anyone have any ideas?
~Matt Walker Wikimedia Foundation Fundraising Technology Team