That's pretty much what I had did, except for one (important) thing. I checked out REL-1_5_0, not the branch since it wasn't listed in the sourceforge CVS browser... it's all working now.
Thanks, On Wed, Jul 21, 2004 at 01:50:04PM -0300, Rob Shortt wrote: > Aubin Paul wrote: > >Ok, could someone explain to me /how/ to put it into the stable > >branch? I checked out a copy of REL-1_5_0 but when I try to commit, it > >complains about sticky tags and refuses it. > > I recommend having a seperate directory containing the 1.5 branch. In > there make a frech checkout/update -r rel-1-5 (rel-1-5 is also known as > a "branch tag" in CVS). That will get you everything on that branch, > then apply diffs from the HEAD changes and commit, when typing your > commit log you should see a notice about committing on the rel-1-5 branch. > > I think there are easier ways to merge changes from one branch to > another (aside by applying the diffs to your 1.5 tree) but I need to > brush up on merging. > > -Rob > > > ------------------------------------------------------- > This SF.Net email is sponsored by BEA Weblogic Workshop > FREE Java Enterprise J2EE developer tools! > Get your free copy of BEA WebLogic Workshop 8.1 today. > http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click > _______________________________________________ > Freevo-devel mailing list > [EMAIL PROTECTED] > https://lists.sourceforge.net/lists/listinfo/freevo-devel ------------------------------------------------------- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click _______________________________________________ Freevo-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-devel
