On 2002.06.23 10:09:50 -0400 marc fleury wrote: > I agree, With what? That we got ourselves into a configuration management nightmare?
> > Can we focus on 3.1? and leave 3.0 as is? The point of my message is that I can't figure out how to determine what is in 3.0.1 but not 3.1 without looking at these 441 changed files individually and also determining some way to find and compare moved files (such as the tm) It is important we put a > stable > version out, it's got to be 3.1. Ummm ok, what about 3.0.1? I notice that the other projects I've seen branch seem to require that everyone apply their changes to one branch or the other but not both. Periodically one person then merges the branch changes back into main and tags everything. Without the tagging step after merge, changes that have been applied to both branches confuse merge. Perhaps we should consider this for future branches. david > > marcf > > |-----Original Message----- > |From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On > |Behalf Of David Jencks > |Sent: Saturday, June 22, 2002 10:42 PM > |To: jboss-dev; JBossGroup > |Subject: [jboss-group] Drift between 3.0.1 and 3.1 > | > | > |I'm getting worried about the number of differences between Branch_3_0 > and > |HEAD. Some work on Branch_3_0 is not yet ported to HEAD, and there are > |enough differences now so even identifying what should be ported one way > or > |the other is getting difficult for me. > | > |To see the extent of the differences, fire up your linux box, put the > |attachments in the jboss-all directory of a 3.0.1 or 3.1 checkout, and > run > |the run-diff.sh. In the created diff directory you should find a > |diff-index.html to look at in your browser. It has links to diffs for > each > |file with a nonempty diff. This just counted 441 changed files. This > does > |not include files present in one version but not the other, such as the > |transaction manager (moved to a separate module in 3.1). > | > |Am I being paranoid or realistic in thinking that it will be difficult > to > |even determine what should be synchronized between branches? > | > |Thanks > |david jencks > > > > ------------------------------------------------------- > Sponsored by: > ThinkGeek at http://www.ThinkGeek.com/ > _______________________________________________ > Jboss-development mailing list > [EMAIL PROTECTED] > https://lists.sourceforge.net/lists/listinfo/jboss-development > > ------------------------------------------------------- Sponsored by: ThinkGeek at http://www.ThinkGeek.com/ _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
