Re: [TSVN] Vendor merge question

Tom Spilman wrote:

> Trying to do a merge of an updated vendor branch like in the Subversion
> book. In the book it says...
>
> http://svnbook.red-bean.com/svnbook/book.html#svn-ch-7-sect-4.1
>
> 'merge the differences between the tag of the previous version and the new
> current version into our main development branch.'
>
> $ cd working-copies/calc
> $ svn merge http://svn.example.com/repos/vendor/libcomplex/1.0 \
> http://svn.example.com/repos/vendor/libcomplex/current \
> libcomplex
> . # resolve all the conflicts between their changes and our changes
> $ svn commit -m 'merging libcomplex-1.1 into the main branch'
>
> How would I do this in Tortoise?

This is currently not possible in TSVN, but I'm working on it.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jun 18 09:49:40 2004