Any other opinions on this? I want to clean this up. Backporting all of the changes in the 1.4 release branch will break some things in trunk, since the composite package uses the new contracts with incompatible changes. So I would like to do the following, which I am not sure how to do in svn, so would appreciate feedback.
1) move current trunk to a 2.0 branch 2) essentially copy 1.4 release branch to trunk, retaining history The idea here is that what is now in trunk should have been branched as 2.0. I could use merge to backport changes after moving only the composite package out, but this would mess up history on the 1.4 sources. I am not sure what the best way to accomplish 2) is and would appreciate comments. Alternatively, I could copy the 1.4 release to a "1.x" branch and leave trunk alone, temporarily dead. That would be the easiest, but does not seem right. Thanks in advance for feedback. Phil On Jan 17, 2008 10:12 PM, Phil Steitz <[EMAIL PROTECTED]> wrote: > On Jan 16, 2008 11:18 PM, Henri Yandell <[EMAIL PROTECTED]> wrote: > > Is development back on trunk yet? > > > > Having it off on a branch worries me :) > > > > We need to make a decision on the 1.3/1.4-incompatible changes that > are currently in trunk, which should probably iteself have been > branched as 2.0. > > My preference is to move the composite package to a composite or 2.0 > branch and merge the 1.4 release branch back into trunk, reverting the > incompatible changes as in 1.4. > > Phil > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
