The releases after 2.0 and string changes..

Dan Meltzer parallelgrapefruit at
Fri Dec 5 07:59:27 CET 2008

On Thu, Dec 4, 2008 at 9:37 AM, Gary Steinert <gary.steinert at>wrote:

> For the new features I'm with you. I don't think the small string changes
> should have to wait until 2.1 though. I think keeping any new features out
> of
> 2.0.x should reduce the pressure on the translators, and will benefit the
> 2.0.x users until we release 2.1.
> Also, instructions for getting git to point to two separate repositories
> would
> be very welcomed =P
A few things to beware of:
1) You can't git merge between git branches that have different svn origins.
 It changes the parent when you git merge and git svn dcommit after that
does all sorts of wacky things (you don't even want to know..)  Use git
cherry-pick to move commits between branches in this case.
2) You will either need to maintain two separate build directories or have
to deal with a full rebuild every time you switch branch checkouts.  My
suggestion would be to use two build directories, and if you use the
cmakekde alias, you can get really kreative and make `cb` check the git
branch you are on and change to a different build directory accordingly.

> Gary Steinert
> On Thursday 04 December 2008 14:12:53 Dan Meltzer wrote:
> > Hi,
> >
> > It seems clear to me that we have a lot of string tweaking to do after
> 2.0.
> > I don't think it's fair however to expect translators to keep up with a
> 1-2
> > week release cycle for our first point releases.  I'm not exactly sure
> the
> > best way we can handle this..
> >
> > I'm wondering if we should immediately branch 2.0, keep it string frozen,
> > and just do bug fixes in it while starting 2.1 development in trunk and
> > planning a 2-3 month development cycle for it (short enough so that the
> > missing strings are not missing forever, long enough to still allow for
> > features).  I think this would be acceptable as many of the 2.1 features
> we
> > have talked about are already implemented and sitting in developers git
> > branches, allowing a whole bunch of changes to land post 2.0.  I think
> this
> > would also allow us to keep 2.0.x fairly stable (as we all want to get
> our
> > new features in after 2.0 is released, but I don't know if it makes sense
> > to put all these features in 2.0.x)
> >
> > The downside to this is that we probably will stop using 2.0.* on a
> > day-to-day basis, and would have to have two checkouts in order to make
> > bugfixes (though you can set up git to have branches that point to
> > different places in svn, which would reduce the amount of different
> > checkouting.)
> >
> > Thoughts?
> _______________________________________________
> Amarok-devel mailing list
> Amarok-devel at
-------------- next part --------------
An HTML attachment was scrubbed...

More information about the Amarok-devel mailing list