Hey Sean, can you clarify why you want to merge now? If we merge now into SVN and then again later into a trunk in BZR, it's not going to work and you're just asking for trouble.... - Albert
On 3/28/09, Sean M. Pappalardo <[email protected]> wrote: > Hello. > > Would anyone have a problem with me attempting to merge the release > branch back to trunk? The divergence has been bothering me. > > As I understand it, the steps involved are: > > 1) Copy lp:~vcs-imports/mixxx/trunk to lp:~mixxxdevelopers/mixxx/trunk > (a.k.a. lp:mixxx,) overwriting it. > 2) Check out lp:mixxx > 3) Merge lp:~mixxxdevelopers/mixxx/release-1.6.2 into lp:mixxx locally > 4) Test compile > 5) If good, commit the merged version. > > This will not affect the release branch (if I do it correctly.) > > The only questions are: > - Did anyone commit anything to lp:mixxx that isn't already in SVN > trunk? Last commit was 6 weeks ago. > - Are we ready to leave SVN behind and switch to BZR completely? > > Let me know! > > Sincerely, > Sean Pappalardo > > <<--------------------------------------------------------------------------------->> > This E-Mail message has been scanned for viruses > and cleared by >>SmartMail<< from Smarter Technology, Inc. > <<--------------------------------------------------------------------------------->> > > ------------------------------------------------------------------------------ > _______________________________________________ > Mixxx-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/mixxx-devel > -- Sent from my mobile device ------------------------------------------------------------------------------ _______________________________________________ Mixxx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mixxx-devel
