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

Merge & comit not consitent

From: Daniel Gehriger <bulk_at_linkcad.com>
Date: 2003-05-20 17:34:06 CEST

The following merge procedure produces an error during commit. I believe
that either the merge should fail, or then if it doesn't fail, the commit
should be possible:

1) I checkout some code using the local file:// protocol:

> svn co file:///repos/trunk/foo

2) I then want to apply the code changes between some branch 1.0 and 2.0 to
the checked out code. For some reason, I now want access the repository
through http:

> svn merge http://reposhost/repos/branches/foo/1.0
http://reposhost/repos/branches/foo/2.0 foo

3) The merge succeeds (although new binary files are generating strange
conflicts, but that's another story). Now I edit some stuff and then commit:

> svn commit foo

Adding foo\newfile
svn: General filesystem error
svn: Commit failed (details follow):
svn: add_file `/branches/trunk/foo/newfile': copy_url is from different repo

Well, it would be nice if I had been warned earlier, during the merge...



To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 20 17:49:40 2003

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

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