[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Branching Strategy and upcoming options.....

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-07-06 14:25:38 CEST

[please respond to the list, not just me]

On Jul 5, 2005, at 10:14 PM, jason scott gessner wrote:

> On 7/5/05, Ben Collins-Sussman <sussman@collab.net> wrote:
>
>>
>>
>> If you look at:
>>
>> http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.4
>>
>> You will see a description of how the SVN team does both release and
>> feature branches.
>>
>>
>>
>
> Thanks.
>
> This section suggests that on a feature branch, only feature work is
> done and no bug fixes from the trunk are moved up to the branch. Is
> this the case? I wouldn't say we are against this, but there is some
> fear about doing this. i think it makes sense and may help us
> "cherry-pick" for a release, but I need to set up a sample project and
> walk through it all.
>
> /me heads off to fire up svnadmin......

Actually, no, the section suggests that for a long-lived feature
branch, that *everything* from trunk is periodically merged to the
branch. Then the branch is ultimately merged to the trunk by
comparing trunk & branch together.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jul 6 14:28:38 2005

This is an archived mail posted to the Subversion Users mailing list.