Damn, forwarding to wikitech-l, forget to click the answer all button :(
Von: Florian Schmidt [mailto:[email protected]] Gesendet: Samstag, 7. Februar 2015 13:29 An: 'Thomas Mulhall' Betreff: AW: AW: [Wikitech-l] jenkings merging Ah, ok. Maybe a little bit background for this: Git is a decentral version manageing tool (basically). Gerrit allows you to review changes before you commit it into your git repository. Now an example: Developer A push a change for review to gerrit (based on the actual master). Developer B push a change for review to gerrit, too (again based on actual master branch). Say, Developer C reviews change from Developer B and +2 it (or set +2, Verified and submit the change). Jenkins will run gate and submit jobs and will trigger gerrit to merge the commit into the git repository. The change will, because it is directly based on master, just be merged and master fast forwarded to the new commit. | master | change from developer B | old master Now, Developer C reviews the change of Developer A and +2 it, too. Now we have a problem. The change based on an older version of the master branch, maybe this graphic helps you to understand it: | master | change from developer B | | change from developer A |/ | old master So, the change from developer A (which is, in fact, a new branch in git) has to be merged into the actual master. In general, gerrit can do this alone (if there are no merge conflicts) which will result in the following history: | new master |\ “Merge change from developer B” | | old master | | change from developer B | | change from developer A |/ | old, old master So, merging is only needed, if you submit a change, which is based on an older master. This will be, if you submit a change, which wasn’t rebased to the actual master and there were other changes submitted before it. In general, this will be in projects with more than one developer (because more developers: more commits and more submitted changes), or if you’re upload a change for review, working on other changes and submit them, and review your first change after it without rebasing. If you have a look at your project: all changes are based on the actual master and submitted without any other change submitted before it, so you have a nice linear git history :D If a merge is needed sometimes, gerrit will do it without any new setup/configuration. Hope that helps and excuse some little faults I maybe made somewhere in this mail :) Kind regards, Florian Von: Thomas Mulhall [mailto:[email protected]] Gesendet: Samstag, 7. Februar 2015 13:02 An: Florian Schmidt; 'Wikimedia developers' Betreff: Re: AW: [Wikitech-l] jenkings merging Like this <https://git.wikimedia.org/commit/mediawiki%2Fextensions%2FCentralAuth/13e92723fc09dd5d9edbf95c2665f3687577ce02> https://git.wikimedia.org/commit/mediawiki%2Fextensions%2FCentralAuth/13e92723fc09dd5d9edbf95c2665f3687577ce02 On Saturday, 7 February 2015, 12:01, Thomas Mulhall < <mailto:[email protected]> [email protected]> wrote: Jenking does it as a commit of its own. On Saturday, 7 February 2015, 12:01, Thomas Mulhall < <mailto:[email protected]> [email protected]> wrote: Hi what I mean is on centralauth jenking says merged this branch. I would like to do that too please. On Saturday, 7 February 2015, 11:53, Florian Schmidt < <mailto:[email protected]> [email protected]> wrote: Hi Thomas, what do you want to do? If you upload a new patchset to a change (or a new change), Jenkins will automatically merge this change with the master branch and runs tests against the resulting artifact :) That's what I know. Kind regards Florian -----Ursprüngliche Nachricht----- Von: [email protected] <mailto:[email protected]> [mailto:[email protected] <mailto:[email protected]> ] Im Auftrag von Thomas Mulhall Gesendet: Samstag, 7. Februar 2015 01:56 An: Wikimedia developers Betreff: [Wikitech-l] jenkings merging Hi how do I get my skins and extensions to be merged automatically by jenkings like it does on centralauth projects are at https://git.wikimedia.org/summary/mediawiki%2Fskins%2FMetrolook <https://git.wikimedia.org/summary/mediawiki%2Fskins%2FMetrolook> and https://git.wikimedia.org/summary/mediawiki%2Fextensions%2FCollapsibleVector <https://git.wikimedia.org/summary/mediawiki%2Fextensions%2FCollapsibleVector> _______________________________________________ Wikitech-l mailing list [email protected] <mailto:[email protected]> https://lists.wikimedia.org/mailman/listinfo/wikitech-l _______________________________________________ Wikitech-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikitech-l
