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

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

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-01-13 23:39:33 CET

Dave Peterson wrote:
> So I've spent the last couple hours or so playing around with TSVN
> merge and SVN merge. My abbreviated story follows -- sorry that it
> is long, but I want to be accurate with my descriptions.

No problem. We like a good read ;-)

> In short, it works. When promoting from the feature branch to the
> trunk I just needed to swap my "From" and "To" urls so that "From"
> was the trunk and "To" was the feature branch. The target path is
> always the local working copy of the trunk. This was necessary no
> matter whether I was using TSVN or SVN.

Good news! It looks as if you were bitten by the same mis-understanding
as others, but in a completely different use case which I had not seen.

> Sorry for the false alarm.

Don't apologise. I think we have all learnt something from this one - I
have certainly learned a lot more about merging, and I will beef up the
docs to include a TSVN-ised version of the examples from the SVN book.
And it has triggered a discussion about how to make TSVN more
user-friendly :-)


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 23:53:37 2005

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