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

Can't merge after changing directory capitalization

From: Jacob Weber <jacob_at_jacobweber.com>
Date: Mon, 16 Aug 2010 10:08:50 -0700

If I change the capitalization of a directory name, it seems to cause problems with merging. I'm using SVN 1.6.11 on Mac OS X. I'm not sure if this is relevant, but OS X doesn't support multiple files in the same directory with the same name and different capitalization. Can I report this as a bug? Do you need any more information?

Here's a test case:

# create trunk and directory
svn mkdir -m "" $REPOS/hello
rm -rf hello
svn checkout $REPOS/hello hello
mkdir hello/test
svn add hello/test
svn commit -m "" hello

# create branch
svn copy -m "" $REPOS/hello $REPOS/hello-br

# remove the directory, and create a new one with a different capitalization
rm -rf hello/test
svn rm hello/test
svn commit -m "" hello
mkdir hello/TEST
svn add hello/TEST
svn commit -m "" hello

# merge trunk into branch
rm -rf hello-br
svn checkout $REPOS/hello-br hello-br
svn merge --accept theirs-full $REPOS/hello hello-br

At this point I get an error:
svn: Working copy 'hello-br/TEST' locked
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)

Running the cleanup command doesn't help.

Received on 2010-08-16 19:09:36 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.