[Pkg-xfce-devel] svn structure and 4.4 packaging

Simon Huggins huggie at earth.li
Mon Jan 23 12:34:59 UTC 2006

Hi Jani,

On Sun, Jan 15, 2006 at 03:52:51PM +0200, Jani Monoses wrote:
> > > > Also the goodies don't have any branches for a particular
> > > > version.
> > > We can keep things in trunk like it is now, but  make this not the
> > > default work/uploading branch.
> > Why not? :)
> to prevent 4.2-isms  slipping in. What I understand by trunk is a
> place where the common code is and branches specialize that. So thunar
> can live in the trunk but 4.2 and 4.4 should merge from trunk and
> modify debian/ dirs accoridngly.  there may not be many differences
> now but you never know :)

I don't really agree.  I think you're thinking of a larger project.
It's mostly unlikely that we'll port stuff between 4.3/4.2 branches if
we go this route.

We're only dealing with debian/ not the whole of say firefox's upstream

> > > So what is now done in trunk _and_ part of xfce (not gooodies,
> > > exo, thunar) let's move over to branches/4.2.3 and do the uploads
> > > from there until 4.2.4 and so on.
> > Right, but how does this get merged in to 4.2.4?
> I assume svn copy branches/4.2.3 branches/4.2.4 or  an equivalent
> command when starting the 4.2.4 cycle, at which point 4.2.3 is frozen.

Hmm, yeah I can see that this is a technical solution but prefer
trunk/4.2 copied to branches 4.2.4 or whatever.

> > At the moment (in theory), we work on trunk, we copy to
> > branches/4.2.3 the first time and then merge to branches/4.2.3 on
> > subsequent releases.
> > Then when 4.2.4 comes along (or 4.3.99-RC1 or whatever) we update
> > trunk appropriately and copy to that version.
> The current situation works too mostly because there is not much
> difference in packaging 4.2 vs 4.4, but it would be more pedantic to
> work on a branch when effectively that branch is targeted.

No, currently we don't have to think about 4.4.  There's no 4.4 code in
SVN which was available in 4.2.

We do need to solve this problem though.

> > > *BUT* what should we do with the goodies?
> > > > And where to exo/thunar/orage sit?
> > > We don't have to reorganize everything, just make the current
> > > situation a bit better for 4.3 work. Orage/thunar seem to work
> > > with 4.2 and 4.4 so they are ok in trunk IMHO.
> > Right but as I explained, they /don't/ sit in /branches/4.2.3 at the
> > moment because upstream doesn't release them all at once under one
> > version tag.  Likewise the goodies.
> Right, as I said only move xfce core - the stuff that clearly is
> different in 4.2 vs 4.4 to branches and keep working on goodies/thunar
> on trunk.

Well that's more confusing surely than just everything in trunk.

I suppose we could do what we do with the goodies and just remove
the branches stuff except for when we want a new version (i.e. now) and
want the 4.3/4.4 stuff.

The copies I've stored in branches are arguably not very useful given
you can get SVN to go back to a particular date/revision for a checkout.

> Now that I think of it, trunk doesn'r really make sense for xfce core
> we could just have the 4.2 and the 4.4 branches.  Either way there are
> going to be mostly manual merges between branches as at least the
> versions in the changelogs conflict.  So I'll just make a 4.3 branch
> and if it is too tedious to merge with trunk we may rediscuss it.

I think merging with trunk in order to go between 4.4/4.2 is a red
herring.  I think 4.4 might start out as a copy of 4.2 stuff but it will
then diverge and there's no point trying to bring stuff back.

Simon Huggins  \ Think of me as CVS with a brain and with some taste. -
                \ Linus Torvalds
http://www.earth.li/~huggie/                                htag.pl 0.0.22

More information about the Pkg-xfce-devel mailing list