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

Problem with Checkin After Merge

From: Brad Bonkoski <bbonkoski_at_mediaguide.com>
Date: 2006-04-20 18:45:54 CEST

Hello,

This problem seems to be new as I have done this before, but...
I have a repository consisting of the directories: branches, production,
and trunk.
I do my development in the branches directory.
I am wrapping up development for a release so I merge it back to the
trunk, which the merge operation goes without a hitch.
but then when I try to check the merge in, I notice that any *new* files
I created on the branch all report an error like:
svn: Source url '....' is from different repository.

Any ideas on how to get around this short of removing the files in the
trunk and manually adding them?

TIA.
-Brad

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 20 18:47:55 2006

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.