[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-30 11:15:06 CET

Axel Hallez wrote:
> Max,
>
> Thanks for your reaction, here is the entries file:

...
> url="file:///C:/svnrepo/trunk/be/gymfed/competition/AGD"
...
> copyfrom-url="file:///c:/svnrepo/branches/ICAGH/be/gymfed/competition/AGD/TeamDetailReportDetail.xml"/>
...
>
> The files with schedule="add" are giving me troubles.

Looks like you've found a bug!

The differing case of the C/c as the drive letter is what is causing svn to
glitch here.

The simple workaround would be to make sure that the case of the repository
root URL is always consistent whereever it is used.

Max.

>> 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!

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 30 11:17:33 2004

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