Re: Can't merge after changing directory capitalization

2010-08-16 Thread Stefan Sperling
On Mon, Aug 16, 2010 at 10:40:06AM -0700, Jacob Weber wrote: > there's nothing here that should require those two files to exist at the same > time. That assumption is wrong, at least for the 1.6.x working copy format. Every file has an associated text-base stored inside of the .svn directory. T

Re: Can't merge after changing directory capitalization

2010-08-16 Thread Jacob Weber
On Aug 16, 2010, at 10:27 AM, Ryan Schmidt wrote: > On Aug 16, 2010, at 12:08, Jacob Weber wrote: > >> OS X doesn't support multiple files in the same directory with the same name >> and different capitalization. > > Just to nitpick this point: of course Mac OS X supports that. But the > case-

Re: Can't merge after changing directory capitalization

2010-08-16 Thread Ryan Schmidt
On Aug 16, 2010, at 12:08, Jacob Weber wrote: > OS X doesn't support multiple files in the same directory with the same name > and different capitalization. Just to nitpick this point: of course Mac OS X supports that. But the case-insensitive Mac OS Extended filesystem most Macs use doesn't s

Can't merge after changing directory capitalization

2010-08-16 Thread Jacob Weber
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 b