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

Re: issue-3390-dev branch question

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Mon, 05 Oct 2009 10:07:37 -0400

Julian Foad wrote:
> Edmund Wong wrote:
>> I checked out issue-3390-dev branch and would like to apply
>> r39285's (gen-win.py modification) patch to it. I can do it locally
>> of course.
>>
>> Is there a point in getting it applied to the actual branch or
>> is the life-span of the branch too short to bother?
>
> Hi Edmund.
>
> That branch is a "feature branch" in terms of how we should merge to and
> from it. What this means is that we should from time to time "catch up"
> with changes that have been made on trunk, by merging all eligible
> changes from trunk to the branch.

It is not the case that we universally maintain feature branches in this
fashion, so I would strongly encourage branch maintainers to add
BRANCH-README files to their branches. See
http://subversion.tigris.org/hacking.html#branch-readme-files for details,
and various uses of the files in our revision history for examples.

(And I say this knowing that I haven't done this myself for the
issue-3242-dev branch. Will remedy that soonish.)

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2403650

Received on 2009-10-05 16:07:48 CEST

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