[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: Daniel Becroft <djcbecroft_at_gmail.com>
Date: Tue, 16 Nov 2010 07:07:29 +1000

 On Mon, Nov 15, 2010 at 11:44 PM, David Weintraub <qazwart_at_gmail.com>wrote:

> 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
> systems.

I realize that, hence why we did our initial renames via URLs, rather than
in a working copy. My question was not so much "Why did I get this
message?", but how should such a change be merged between trunk and branch.
Any merge requires a working copy.

I suspect that the correct method is:
 - Merge everything up to and including) rX-1, and commit.
 - Rename file manually over URL
 - Record-only merge of rX
 - Merge everything from (and including) rX+1 to HEAD, and commit.

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

The messages are being generated by the client (there were no post-commit
hooks in my sample repository).

Daniel B.
Received on 2010-11-15 22:08:30 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.