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

Re: Changing file case on Windows then doing a merge fails.

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-09-13 11:41:52 CEST

On Sep 13, 2005, at 10:45, erymuzuan wrote:

> On Sep 12, 2005, at 17:09, Joshua Varner wrote:
>
>> We had a file called ITools.pas and wanted to call it iTools.pas,
>> windows being case insensitive this was done in two passes, pass
>> one was to rename it to _iTools.pas and commit then rename it to
>> iTools.pas and commit again.
>>
>> Both these changes were then merged to a release branch as part of a
>> larger merge from the trunk. It failed because the working copy code
>> tries to keep copies of ITools.pas and iTools.pas at the same time
>> and it cannot. Once the commit fails revert also fails.
>
> another way is to delete the old file on the server directly (use svn
> del url_to_the_old_file -m message), and run the update again. it
> works in my case,

I don't think this has anything to do with the problem at hand, which
is how to merge a case-changing rename into a working copy.

> the real problem is how to stop this from happening
> in the first place, I wander is there anoyone has written a pre-commit
> script , to disallow commit when there's already and item int the path
> with the same name but differs only case.

Yes, of course. It's in the contrib/hook-scripts directory of the
Subversion source distribution and it's called check-case-
insensitive.pl.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 13 11:45:06 2005

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