Re: [TSVN] Vendor Branch and Merging Diffs

Bryan D. Andrews wrote:

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

Ok, I don't expect people to search the mailing list weeks back, but is
it really so hard to just browse 5 mails back?

This got implemented in revision 1250 as I mentioned exactly 5 mails
earlier.

Stefan

---------------------------------------------------------------------
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:20:07 2004