On 11/16/06, Jason Dillon <[EMAIL PROTECTED]> wrote:
What is the branch going to be? I hope that we will branch trunk into
branches/1.2 and then update trunk to 2.0-SNAPSHOT.
If we use svk to facilitate merges on a timely basis then we should
not get much drift between them.
I heard some suggestion of copying trunk to branches/2.0 and then
eventually replace trunk with branches/2.0 which seems offal
backwards.
You are right. I still have nightmares about the dead-trunk we did at
the beginning of 1.2 :-)
Keeping the trunk for "futuristic" work seems to be the right thing to do.
I think it may be time to make a branch to allow the JavaEE 5 work to
continue while we finish up 1.2... I recommend we:
* svn cp trunk branches/1.2
* update trunk to 2.0-SNAPSHOT
* setup svk to facilitate merges from branches/1.2 to trunk
--jason
Cheers
Prasad