On Wed, Apr 11, 2012 at 9:57 AM, Chad <innocentkil...@gmail.com> wrote: > On Wed, Apr 11, 2012 at 2:46 AM, Raimond Spekking > <raimond.spekk...@gmail.com> wrote: >> Am 11.04.2012 00:46, schrieb Rob Lanphier: >> >>> Hi everyone, >>> >>> Sam has created the wmf/1.20wmf1 branch and deployed it to >>> test2.wikipedia.org and mediawiki.org. So, please, go for and test! >>> >>> Oh, btw, enjoy the pretty new diff colors! :) >>> >>> http://www.mediawiki.org/w/index.php?title=MediaWiki_1.19%2FRoadmap%2Fstatus&diff=516437&oldid=508794 >>> >>> Rob >> >> >> Congrats :-) >> >> A few questions: >> >> 1. What ID was the branch point? Is this still the correct term? >> > > More or less. You can say "what commit was it branched at" too. > In either case, the answer for core is 11f768c[0]. You can see the > first couple of commits to wmf/1.20wmf1 starting with "Creating > new WMF 1.20wmf1 branch." If you open any of the submodules > in that commit, you'll be able to see the commit hash they were > pinned at in the submodules. > >> 2. How can I track which IDs will be deployed after this initial deployment? >> Currently I follow >> https://gerrit.wikimedia.org/r/#q,mediawiki/+status:merged+branch:master,n,z >> to read all merged commits. >> Is there a 1.20 branch? >> > > We branched from master, so everything's that's been merged in > core or WMF-deployed extensions should be included. The commit > sha1s (different for each extension) show up on Special:Version[1] > and they link to GitWeb for each of those extensions. > > The cool thing about branching in git is you no longer see history > on the deployment branch that starts *at the branch point.* You > see the whole history of the file (as it appeared on master), so > it's easy to track down where the file is in relation to master. > > -Chad > > [0] > https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/core.git;a=shortlog;h=refs/heads/wmf/1.20wmf1 > [1] https://test2.wikipedia.org/wiki/Special:Version
Reading back over my own e-mail, I realized it's a bit hard for people to dig up the branch point if they don't know what they're looking for--for future iterations, we'll have make-wmf-branch include the branch point as part of the initial commit message. -Chad _______________________________________________ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
