[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: Tom Mornini <tmornini_at_infomania.com>
Date: 2005-01-02 19:53:44 CET

On Jan 1, 2005, at 7:38 AM, Ben Collins-Sussman wrote:

> 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.

I'm pretty sure you left out the important step:

1a) Test branch one last time.

:-)

Happy new year to all!

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 2 19:56:14 2005

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