[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 05 Oct 2009 10:07:50 +0100

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.

The standard way to do this is "svn merge ^/trunk" on this branch.

As it has been six months without a catch-up, this merge is likely to
produce quite a few conflicts. If the conflicts are difficult to
resolve, you can revert the attempt and instead merge the changes in
smaller batches, such as:

  svn merge ^/trunk_at_37500
  <resolve>
  svn ci -m "On the issue-3390-dev branch: catch up with trunk_at_37500."

  svn merge ^/trunk_at_38000
  <resolve>
  svn ci -m "On the issue-3390-dev branch: catch up with trunk_at_38000."

  svn merge ^/trunk
  <resolve>
  svn ci -m "On the issue-3390-dev branch: catch up with trunk."

Or, as there are only two changes on the original branch, an alternative
and probably quicker way would be to delete the branch, re-create it
from latest trunk, and then merge the original branch changes (r37080,
r37644) into it.

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2403490
Received on 2009-10-05 11:08:11 CEST

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