Scott M Stark wrote:
>
> 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.
>
That makes sense. I've one more question, which David has given me some
help on but I want to clear up the exact procedure. Do the CVS admin
guidelines on tagging apply? I just (admittedly belatedly) tried to set
the tag for the 2_4 branch to Rel_2_4_4_5, but got a warning that it
already existed on two files:
W src/main/org/jboss/ejb/plugins/BMPPersistenceManager.java :
Rel_2_4_4_5 already exists on version
1.22.4.2 : NOT MOVING tag to version 1.22.4.1
W src/main/org/jboss/ejb/plugins/MessageDrivenTxInterceptorBMT.java :
Rel_2_4_4_5 already exists on
version 1.4.6.1 : NOT MOVING tag to version 1.4
Presumably because these files had changed and I forgot to do an update
beforehand. The guidelines say to check the current tags on a single
file to work out the next one, so I looked at build.xml and chose the
2.4.4.5 as the next build version. Shouldn't the release tags be
applied across the whole codebase? Or am I missing something due to my
lack of cvs experience (more than likely)?
Also, why is tagging the main branch optional if committing directly to
it but required if merging changes from another branch?
cheers,
Luke.
--
Luke Taylor. Monkey Machine Ltd.
PGP Key ID: 0x57E9523C http://www.mkeym.com
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
