Re: Can't merge after changing directory capitalization

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.
The text-base has the same name as the working file it belongs to.

We need a directory to stay around even after deleting it, because there
is still valuable meta data inside of the .svn directory of the deleted
directory.

Both of these properties of the 1.6.x working copy prevent it from properly
supporting case-only renames and similar situations during merges.
During a merge, the text-bases of all files and all deleted directories
need to remain on disk so that Subversion can revert the local modifications
produced by the merge.

These problems are being addressed for 1.7.

Text-bases are now called pristines and are named after the SHA1 hash
of file content, rather than the file's path. This has already been
implemented on trunk:
  $ ls .svn/pristine/
  6c007a14875d53d9bf0ef5a6fc0257c817f0fb83
  d046cd9b7ffb7661e449683313d41f6fc33e3130

Also, there will only be a single .svn directory at the working copy root
holding all meta data of the entire working copy, so we can remove deleted
directories from disk.

> Can I report this as a bug? Do you need any more information?

No and no. Please don't file a bug. Just wait for 1.7.

Thanks,
Stefan
Received on 2010-08-16 19:58:25 CEST