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

[TSVN] Vendor Branch and Merging Diffs

From: Bryan D. Andrews <bandrews_at_trendinfluence.com>
Date: 2004-06-18 23:07:38 CEST

I am trying to use the Vendor branch management procedure
(http://svnbook.red-bean.com/svnbook/ch07s04.html#svn-ch-7-sect-4.1) and
was wondering if there was a way to do this in tSVN:

$ 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'
...

I see that I can merge the changes from the last revision which would
effectively do the same thing for me - but I would like to know if its
possible to specify the tag somehow.

Thanks.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Jun 19 00:10:08 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.