Re: Branching best practices (In reply to: Adopting a branch as trunk)

On Dec 2, 2004, at 1:22 PM, Jeroen Leenarts wrote:

> Wouldn't it be best to let the trunk always be the main line of
> development? When a release is made you create a branch tagged with
> the version name. (ie. branch/1.0 or branch/2.0) That way no difficult
> merging is required since changes to the branches will almost allways
> be bugfixes which you usally want to merge on an individual basis into
> the main line of development?

True...
But very often version 2.0 work is started before version 1.0 is
complete, so the 2.0 code can't go into a 1.0 trunk yet. I think that
is the scenario that Guido has.

I think that two reasonable options would be:

1)move/rename trunk to branches/1.0 and then move/rename branches/2.0
to trunk.

2)copy the trunk to branches/1.0 and then merge branches/2.0 into the
trunk (and delete branches/2.0 until 2.0 is released).

Scott

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Dec 2 19:40:57 2004