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

Issues with svn merge and tortoisesvn revert

From: Chris Withers <chris_at_simplistix.co.uk>
Date: 2004-06-30 23:52:43 CEST


Just finished chasing my tail a lot trying to do some vendor drops.
I have a repository accessible through file:/// and https:///.

Here's what I did:

svn import Product v1.1 to file/vendor/Product/1.1
svn copy http/vendor/Product/1.1 to http/customer/Product

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
file/customer/Product working copy.

I got:
svn: Access schema mixtures not yet supported
('http/vendor/Product/1.2/subfolder' and 'file/customer/Product/subfolder')

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
file/customer/Product working copy.

That gave:
svn: URL 'file/vendor/Product/1.2/subfolder' doesn't match existing URL
'file/customer/Product/subfolder' in 'Product/subfolder'

Now, the problem turned out to be, with much help from Ben Reser, to be that
vendor/Product/1.1 and cendor/Product/1.2 had no common ancestry. Once I'd
really "done it by the [red bean] book", it worked as it should.

I know what I was doing would have resulted in the repository taking up more
space on disk, but surely it should have worked?

To further hamper me along the way. After I'd done the failed merge, I used
TortoiseSVN to revert the folder I had done the merge in. It restored the files,
but a "svn status" still reported that changes had been made. I only found this
out after I had become significantly balder ;-)

Should I report either of these as bugs in the Subversion or TortoiseSVN trackers?



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.