I'd just like to echo that doing any sort of merging is just asking for headaches later when we move the release branch into the launchpad trunk. Nobody with commit access is going to be working on anything non-release related right now anyway, so the divergence isn't affecting anybody. Users who want access to the bleeding edge can use our bzr release branch.
cheers, rj Albert Santoni wrote: > On Sun, Mar 29, 2009 at 9:14 PM, Sean M. Pappalardo > <[email protected]> wrote: > >> Albert Santoni wrote: >> >>> Hey Sean, can you clarify why you want to merge now? >>> >> I dunno...it's just bothering me that things are diverging and that some >> great bug fixes in the release branch aren't available to anyone working >> on stuff in trunk yet. But I get the feeling that almost noone is >> working on trunk ATM, so I guess it doesn't matter, especially since >> we're so close to release anyway. >> > > Yeah, I think only Garth has made changes to trunk, and my > understanding was that they were aimed at post-1.6.2 work. Don't let > divergence scare you - that's _why_ you branch, divergence is > powerful. :) > > > >> Eww, no. Break off SVN and merge from the release branch into the BZR >> copy of trunk, then use that from now on. (Freeing you to delete Mixxx >> from SF once you move the mailing list.) >> >> > > Ok, BTW I don't think our "trunk" in BZR is synced with trunk in SVN. > Only the "vcs-imports" branch is synced with SVN. So when we want to > move from SF to Launchpad, we'd merge the vcs-imports branch (SVN on > SF) to our trunk in Bzr. > > Thanks, > Albert > > ------------------------------------------------------------------------------ > _______________________________________________ > Mixxx-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/mixxx-devel > ------------------------------------------------------------------------------ _______________________________________________ Mixxx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mixxx-devel
