On Tue, 2007-01-30 at 15:23 +0000, Roger Leigh wrote: > >>> Branches don't work so well for ubuntu as you have to pull over the > >>> changes from the main branch to the ubuntu branch on every > >>> release. Which means (unneccessary) work. > >> > >> It is work, yes, but in many cases it is necessary, and we do quite a bit of > >> it at present. > > > > Hopefully the graphic above makes it clear why a branch isn't the most > > helpfull construct for it. Unfortunately I know of no RCS that has > > something better for this kind of parallel developement. > > tla star-merge ? or just about any recent VCS to be honest. bzr merge handles back and forth work like this trivially. -Rob -- GPG key available at: <http://www.robertcollins.net/keys.txt>.
Description: This is a digitally signed message part