I am planning on integrating the changes I make to Branch_3_0 into head once I have everything working with 3.0.
--jason > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:jboss- > [EMAIL PROTECTED]] On Behalf Of David Jencks > Sent: Saturday, June 22, 2002 10:42 PM > To: jboss-dev; JBossGroup > Subject: [JBoss-dev] 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
