[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 19:59:25 CET

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

> This example (or one close to it) is given in the SVN book; it then goes
> on to say that it will probably not do what you want it to, but it then
> doesn't give an example of why you might want to use it.

It won't do what you want it to in one development pattern - the one where you
haven't merged changes in the trunk into your branch. It will do what you want
it to if you're following the other pattern where you do sync trunk changes into
your branch periodically and then want to sync your branch changes back to the

> The problem is that the users are getting confused between to/from and
> source/dest. They want to merge branch into trunk, and they are setting
> From: Branch <at> HEAD
> To : Trunk <at> HEAD
> which is not what they want.

Again, it depends on your process. One command won't fit all processes as is
being proved out here. My problem is that I want the process that doesn't seem
to be as common with the rest of you. ;-)

Dave Peterson

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

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