| Issues with svn merge and tortoisesvn revert
From: Chris Withers <chris_at_simplistix.co.uk>
 Date: 2004-06-30 23:52:43 CEST 
Hi,
 Just finished chasing my tail a lot trying to do some vendor drops.
 Here's what I did:
 svn import Product v1.1 to file/vendor/Product/1.1
 much time passes
 svn import Product v1.2 to file/vendor/Product/1.2
 attempt to svn merge http/vendor/Product/1.1 http/vendor/Product/1.2 to a 
 I got:
 Figuring I needed to use file urls the whole way through, like the checkout, I 
 svn merge file/vendor/Product/1.1 file/vendor/Product/1.2 to a 
 That gave:
 Now, the problem turned out to be, with much help from Ben Reser, to be that 
 I know what I was doing would have resulted in the repository taking up more 
 To further hamper me along the way. After I'd done the failed merge, I used 
 Should I report either of these as bugs in the Subversion or TortoiseSVN trackers?
 cheers,
 Chris
 PS: I hate to say this, but please keep me CC'ed in as I'm not a list subscriber...
 
-- 
Simplistix - Content Management, Zope & Python Consulting
            - http://www.simplistix.co.uk
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul  1 01:31:24 2004 | 
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.