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

Re: Clarification on merging branch back into trunk.

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-01-01 16:38:47 CET

On Dec 31, 2004, at 12:16 PM, Kris Deugau wrote:

> On a longer development cycle, you may
> end up merging from the trunk into your branch to make sure you don't
> wander too far from the trunk (IIRC this is mentioned in the book).
>

By the way, this is what we're doing for the new svn locking feature.
It's being developed on a long-lived branch. Once a week, we merge
-all- new trunk changes to the branch. (You can think of this as
analogous to running 'svn update'.) When the feature branch is finally
done, we'll

   1. merge all new trunk changes to branch one last time,

   2. merge the branch to the trunk by comparing HEAD of trunk with
HEAD of branch. (Sort of analogous to running 'svn commit'.)

So while it's fairly unusual to compare the tips of two different
branches in a merge command, there are times when it can be useful.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jan 1 16:41:14 2005

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