Are you expecting that this will be merged back into HEAD, or HEAD merged into this in the future? Unfortuntately I think your chance of merging 2 diverged branches (where ongoing work has gone on in both) with CVS is next to nil. What is probably more realistic is for Jason or whoever to do his refactor on the stable branch (on his machine only), and while he is refactoring keep updating with checkins to this branch so he is basically tracking the branch, and then check in the refactor when it actually works...


[EMAIL PROTECTED] wrote:


As you may have noticed, the MAVEN_RC1_STABLE branch is now open for business.

I've backported the fixes post the RC1 refactor tag, so it should all be up to date.

The goal is to keep this a functioning set of code and apply fixes to it until the refactor is ready to be dropped in. As such, all non-core work should happen in this branch.

--
dIon Gillard, Multitask Consulting
Blog:      http://blogs.codehaus.org/people/dion/






--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]



Reply via email to