On Fri, Apr 6, 2012 at 4:59 PM, Rob Lanphier robla@wikimedia.org wrote:
Also, some bikeshedding on the branch name: I vote that the branch name to be wmf/1.20wmf01 , and subsequent deployments to follow that scheme. That way, we can still say 1.20wmf01 as shorthand, and people can figure out that "oh, you prefix wmf/ on the front for permissions reasons".
Sounds fine.
Other work that's underway or needs to get underway:
- Chad has started the work of converting make-wmf-branch to Git:
https://svn.wikimedia.org/viewvc/mediawiki/trunk/tools/make-wmf-branch/defau...
This is almost done enough for the first deploy.
- Aaron is also working on the scripts for pulling our WMF-specific
hacks and reapplying them in 1.20.
Like I said to him on IRC, the absolute best thing to do here is get them into master so we can avoid the conflicts. Worst case, we can just apply them manually to the branch once we've made it.
- We still need to audit the scap/sync scripts to make sure that .git
folder is being excluded on scap. Roan has started looking at that now.
Awesome.
During the next few weeks while both 1.19wmf1 and 1.20wmf01 are out there, we're going to need to use both Subversion and Git for deployment-oriented code.
That's part of the fun ;-)
-Chad