[Pkg-mediawiki-devel] Consolidating MW branches

[Thorsten Glaser]

On Mon, 15 Oct 2012, Jonathan Wiltshire wrote:

> No, what we had before (as a result of my branch naivety some time ago) 
> was:
[…]

Oh, sorry. Then I probably misread the direction of the diffs.

> Whereas we now have two projects containing a conventional 
> branches/tags/trunk layout each.

Right, that is good :) Lemme svn up in the whole-repo checkout…

> You may observe that the newly-conventional layout is ideal for use 
> with git-svn/svn2git :-) in fact this was my motivation, amongst other 
> things.

I see.

> svn just annoyed me once too often.

Yeah, I was just using bzr myself.

> I planned soon to float the 
> idea of converting the repository to git altogether - since we're having 
> that conversation now anyway do you have any objections to that?

I guess I don’t object, and with that layout, it can be done “right”.
I *do* miss my RCS IDs then…

But please don’t get any ideas about gbp or some such nonsense ☺
It’s perfectly fine to do as we’re doing now and just run the normal
Debian way “dpkg-buildpackage -rfakeroot -S -I -i” to make a source
package to run through cowbuilder/sbuild.

> I'm afraid I don't use bzr anywhere else to I'm not motivated to
> convert MW to that.

Well, bzr can use svn repositories. (And it can use svn 1.5, at least,
checkouts; it handles them as “special cases” of bzr bound branches.)
So that was actually not needed.

But I lost that fight in FusionForge, where it actually made sense,
upstream, on last week’s IRL meeting, and in MediaWiki, a move to
separate git repositories makes sense.

There *is* one *big* exception: the mediawiki-extensions code as it
stands right now can only pull from svn, and the unversioned/ top-
level directory in our SVN is to throw stuff in that wasn’t in SVN
to begin with. So it must be kept, for now. (Mid-term, since most
extensions moved to git too, I guess Romain should think about some
changes to mw-extensions to support that.)

> Adam and I had a long look at it in person yesterday and reviewed all 
> the changes

Ah, great. IRL meetings always help, yeah.

> WRT the extensions... Do you need help keeping them up-to-date in the 
> longer term so we don't have this problem again?

The problem here wasn’t lag on the extensions side, but rather that
the extensions are specific to the MW versions, so I tracked the 1.15
branch of these (and fixed them in-place) until we switched MW to 1.19,
then I switched those extensions to 1.19 (and fixed them). My delay was
mostly due to the mediawiki task being a complicated mess that was not
easily separated, plus some MW changes annoyed me on the FF side, and,
since my priority (I get paid for this, remember) was the FF side, I
didn’t investigate MW without FF integration. (It helps that our FF
flavour drives/enables most of the extensions.)

> (I have avoided getting 
> too involved previously so that I don't end up over-committing my time.)

I guess that’s too late for me already :| but thanks anyway.

bye,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-314
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Boris Esser, Sebastian Mancke