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

Re: Merging case-only renames to branch

From: David Weintraub <qazwart_at_gmail.com>
Date: Mon, 15 Nov 2010 08:44:50 -0500

On Sun, Nov 14, 2010 at 7:12 PM, Daniel Becroft <djcbecroft_at_gmail.com> wrote:
> Hi,
> We've recently had to rename a couple of files on trunk by case only (e.g.
> FOO.C to foo.c), which we did via a URL-only rename. This worked perfectly.
> We then encountered a strange error when attempting to merge this revision
> across to our release branch. Because the revision contains both an ADD and
> a DELETE for (essentially) the same file, we got an "Error bumping revisions
> post-commit)" message. I've reproduced the error with a sandpit environment
> using 1.6.13 (below).

Okay, you're using Windows. On Windows, Foo and foo are the same file,
but on Unix, they're two different files. Subversion is suppose to be
case sensitive, so Foo and foo are two different files in Subversion
whether or not the server or client are on Windows systems or Unix

Do you have any post-commit hooks? If you are, are the messages being
generated by Subversion or the post commit hooks?

David Weintraub
Received on 2010-11-15 14:45:26 CET

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.