David Glasser wrote:
> * The working copy you're merging into is a pristine, single-rev,
> unswitched checkout: ie, it's something you could get as a fresh
> checkout of some URL@REV
>
> * The branch you're merging from has (according to mergeinfo) all of
> the changes on that URL up to REV integrated (using cmpilato's
> merge source normalization / location segments)
>
> In that case, you can just type
>
> $ svn merge url://to/feature-branch
>
> and it will do the right thing. We will also make it add mergeinfo
> for this merge.
dglasser++
This is excellent and, speaking personally, this would cover most of my
merging needs, since I tend to use the "Branch per Change-Request"
pattern[*].
However, this wouldn't help at all the other primary task (merging
features between multiple mainline branches, i.e. the "Codeline per
Release" pattern[*]. But if the feature branches are always committed
as a single lumped change, it is relatively easy to use -c ### to pull
them in as needed.
John
*) http://www.cmcrossroads.com/bradapp/acme/branching/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Dec 5 20:31:40 2007