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

Re: Unable to commit after merge

From: Max Bowsher <maxb_at_ukf.net>
Date: 2004-11-25 21:13:31 CET

Axel Hallez wrote:
> Hello all,
>
> My problem is as follows:
> I merged the changes of a branch back to my working copy (taken from
> trunk).
> In the branch there where some files added, which was correctly detected
> in the merge operation, so they where added to my working copy too.
> However when I wanted to commit the changes in my working copy to trunk
> I got an error, saying that the added files could be committed since
> they belonged to a different repository!
>
> Did I do something wrong? Is there a solution?

To help us understand the problem, please show us the contents of the
.svn/entries file for a directory which contains one of the problem added
files.

Max.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 25 21:16:04 2004

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