[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: Joshua Varner <jlvarner_at_gmail.com>
Date: 2005-09-12 17:09:03 CEST

On 9/12/05, Martin Tomes <lists@tomes.org> 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.
>
> Is this a known issue? I cannot tell as tigris.org is giving 'Internal
> server error' messages.
>

This particular recipe has not been reported, but similar behavior
is known. There is currently no fix for this. A workaround would be
to delete that directory out of your working copy, then updating to
get it back. You could merge up to the revision with _iTools.pas name,
commit, then merge the change to iTools.pas. That should work.

Currently an acceptable design for this type of problem has not
appeared, so it remains unresolved.

Josh

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Sep 12 17:12:34 2005

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