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

Can't commit files "from different repository"

From: Jeff Disher <jmdisher_at_uwaterloo.ca>
Date: 2005-02-07 08:16:14 CET

I corrupted my SVN repository, at some point, so I reverted to one I
thought was the most up-to-date (this was a few months ago). Since
then, I have been working on some of the projects within it, but
haven't done too much actual work.

Yesterday, however, I found a backup of the old SVN which I had
forgotten about and it holds some key work which I had done on one of
my projects which I had lost in the corruption and didn't restore.

Now I am trying to extract the useful parts of this one project from
the old backup and merge them into a copy from the repository I am
using, currently. However, I can't figure out how to re-parent the
files without manually going through and copying them over (there are
tons since there are some bundles, etc, so doing so would take a long

I tried to use svn merge and give the range from where the source
streams diverged which, although it seemed to be working, it fails on
commit with the error:

svn: Source url '/path/to/some_file.h' is from different repository

I guess it was expecting not to have to copy the whole file but that is
what I need. svn switch doesn't seem to do what I want, either.

So, the short question is: Is there any way to merge across


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 7 08:15:59 2005

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.