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

cas problem faq a

From: Carl Karsten <carl_at_personnelware.com>
Date: 2004-09-22 21:43:58 CEST

I am working on a better answer than
http://subversion.tigris.org/project_faq.html#case-change (In normal use, the
case change of foo.txt was probably the result of also changing the file, so now
there are pending changes that need to be committed. The current faq answer
says "The first update will remove file.java from your working copy" which isn't
a great solution. )

I have hooked in check-case-insensitive.pl and that takes care of keeping the
server out of trouble, but the client still needs to be cleaned up, and I am not
happy with my current steps. It seems that we need an un-add command to pull a
change that the server is rejecting, but without whacking the local copy.

Anyway, here is what I have:

Starting with a clean server:

svnadmin create /home/carl/subversion/sources/TestProj2
cp TestProject/hooks/pre-commit TestProj2/hooks/
cp TestProject/hooks/check-case-insensitive.pl TestProj2/hooks/
cp TestProject/conf/svnserve.conf TestProj2/conf/

Run this in windows (2k for me):

Cd d:\temp
Rd /s/q TestProj2
svn checkout svn://dev.personnelware.com/TestProj2
cd TestProj2
echo x>foo.txt
svn add foo.txt
svn commit -m "here is lower foo"

echo y>>FOO.TXT
ren foo.txt FOO.TXT
svn add FOO.TXT
svn commit -m "trying to send FOO"

copy foo.txt \temp
svn rm --force foo.txt
move \temp\foo.txt foo.txt
svn commit -m "new foo.txt"

Here is what you get:

D:\temp\TestProj2>Cd d:\temp

D:\temp>Rd /s/q TestProj2

D:\temp>svn checkout svn://dev.personnelware.com/TestProj2
Checked out revision 0.

D:\temp>cd TestProj2

D:\temp\TestProj2>echo x 1>foo.txt

D:\temp\TestProj2>svn add foo.txt
A foo.txt

D:\temp\TestProj2>svn commit -m "here is lower foo"
Adding foo.txt
Transmitting file data .
Committed revision 1.

D:\temp\TestProj2>echo y 1>>FOO.TXT

D:\temp\TestProj2>ren foo.txt FOO.TXT

D:\temp\TestProj2>svn add FOO.TXT
A FOO.TXT

D:\temp\TestProj2>svn commit -m "trying to send FOO"
Adding FOO.TXT
Sending foo.txt
Transmitting file data ..svn: Commit failed (details follow):
svn: 'pre-commit' hook failed with error output:

File name case conflict found:

  FOO.TXT already exists as foo.txt

D:\temp\TestProj2>copy foo.txt \temp
        1 file(s) copied.

D:\temp\TestProj2>svn rm --force foo.txt
D FOO.TXT

D:\temp\TestProj2>move \temp\foo.txt foo.txt

D:\temp\TestProj2>svn commit -m "new foo.txt"
Sending foo.txt
Transmitting file data .
Committed revision 2.

D:\temp\TestProj2>rem ssvn commit -m "whack foo.txt"

D:\temp\TestProj2>

Carl Karsten
http://www.personnelware.com/carl/resume.html

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 22 21:42:08 2004

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