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

[TSVN] Re: TSVN Merge issue vs. "Feature Branches" in SVN book

From: Dave Peterson <dpeterson_at_enthought.com>
Date: 2005-01-13 18:46:14 CET

Simon Large <slarge <at> blazepoint.co.uk> writes:

> SVN also provides an alternate form:
> svn merge URL1 <at> rev URL2 <at> rev [WCPATH]
> But I am struggling to see what this form is used for, so I am not sure
> how best to modify the UI so that this form is adequately supported.

Besides the usecase for it that someone else provided, this is exactly what I'm
trying to do with my usecase where the feature branch periodically pulls in
changes that were committed to the trunk. Once you do that, and commit to
pulling trunk changes down prior to promoting back to the trunk, the only way to
express the changes in the feature branch is to diff (with ancestory of course)
the trunk and feature branch and merge that diff into your local working copy of
the trunk.

Am I missing some other way to handle this usecase?

> What do you suggest? I only came up with a minor change:

Given that the SVN Book talks about a merge operation finding the diff between
two trees and applying it to a path, how about the sections of the UI be called
something like "From Tree", "To Tree" and "Apply changes to path"?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 18:52:37 2005

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