Main and 2.4 are in general too far apart to make merging changes between branches doable. You have to treat them as independent versions and apply fixes to both branches using seperate cvs working versions.
----- Original Message ----- From: "Luke Taylor" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Saturday, October 27, 2001 7:21 AM Subject: Re: [JBoss-dev] Build and test procedure questions etc. > Ok, thanks, I'm suitably confused :-)... I would understand this as > being used when you want to merge updates that you don't have yet into > your code (e.g. if you know that the changes are only stable up to a > certain version). But I have the latest version of the main tree > checked out and want to also apply the changes to the 2.4 branch... > Having looked at the cvs manual, it seems I can use -j to go backwards > too, thus removing previous version changes from my working copy. But > it's giving me a sore head thinking about it so I think I'll just check > the 2.4 branch out and commit it separately... > > Thanks, > > Luke. > _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
