[Pkg-mediawiki-devel] Consolidating MW branches

[Jonathan Wiltshire]

On 2012-10-15 15:00, Thorsten Glaser wrote:
> On Sat, 13 Oct 2012, Jonathan Wiltshire wrote:
>
>> I've just consolidated the 3 branches in the subversion repository
>> into the more conventional tags/branches/trunk layout.
>
> Actually, what we had before was called the 'trunk1'
> layout, which works like this:

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

+-- mediawiki
     +-- lenny
     +-- squeeze
     +-- sid-sec
     +-- tags
     +-- trunk
+-- mw-ext
     +-- branches
     +-- tags
     +-- trunk

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

> What we have now is a nōn-standard layout, which will
> require some manual bzr configuration… ouch… but okay,
> can deal with that.

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. svn just annoyed me once too often. 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'm 
afraid I don't use bzr anywhere else to I'm not motivated to convert MW 
to that.

> Still, thanks for caring about MW at all ;-) According
> to DDPO, the two packages mediawiki and mediawiki-extensions
> have been unblocked (thanks adsb) and are valid candidates,
> so the cherry-pick wheezy branch is a good thing now.

Adam and I had a long look at it in person yesterday and reviewed all 
the changes, though we had little choice but to close our eyes and hope 
WRT the extensions... Do you need help keeping them up-to-date in the 
longer term so we don't have this problem again? (I have avoided getting 
too involved previously so that I don't end up over-committing my time.)

-- 
Jonathan Wiltshire                                      jmw at debian.org
Debian Developer                         http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

<directhex> i have six years of solaris sysadmin experience, from
             8->10. i am well qualified to say it is made from bonghits
			layered on top of bonghits