On 9/15/09 4:42 PM, brion(a)wikimedia.org wrote:
For those of you poking at the code, I've got the
pre-deployment code
currently sitting in the wmf-deployment-work branch; this'll get folded
back over wmf-deployment when we're ready to go.
I have now swapped the new branch in over wmf-deployment.
Note that when svn up'ing your wmf-deployment checkouts, you might see
some "tree conflicts" depending on your SVN version, as more extensions
not used in live deployment have been trimmed out to simplify things.
You should be able to mass-fix those with something like:
svn -R resolve --accept=base .
Or just remove the extension dirs and re-'svn up' them.
-- brion