Problem with Checkin After Merge

[Brad Bonkoski <bb...@mediaguide.com>]

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

Re: Problem with Checkin After Merge

[Garrett Rooney <ro...@electricjellyfish.net>]

On 4/20/06, Brad Bonkoski <bb...@mediaguide.com> wrote:
> 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?

You're going to need to be much more specific about the problem you're
seeing.  What commands did you use to run the merge?  Where was the
working copy checked out from in the first place?  What is the EXACT
error message you got in response to the checkin attempt?

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org