Re: Merging case-only renames to branch

2010-11-15 Thread Erik Huelsmann
On Mon, Nov 15, 2010 at 10:07 PM, Daniel Becroft wrote: > On Mon, Nov 15, 2010 at 11:44 PM, David Weintraub wrote: >> >> On Sun, Nov 14, 2010 at 7:12 PM, Daniel Becroft >> wrote: >> > Hi, >> > >> > We've recently had to rename a couple of files on trunk by case only >> > (e.g. >> > FOO.C to foo.

Re: Merging case-only renames to branch

2010-11-15 Thread Daniel Becroft
On Mon, Nov 15, 2010 at 11:44 PM, David Weintraub wrote: > On Sun, Nov 14, 2010 at 7:12 PM, Daniel Becroft > 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. > > >

Re: Merging case-only renames to branch

2010-11-15 Thread Daniel Shahaf
Can you try with a newer 1.7 build? Re FOO->foo or foo->FOO, I suspect it's because we iterate some hash table's keys (so the order of iteration is unpredictable). Daniel (it's actually a thread for dev@) Daniel Becroft wrote on Mon, Nov 15, 2010 at 10:12:39 +1000: > Hi, > > We've recently had

Re: Merging case-only renames to branch

2010-11-15 Thread David Weintraub
On Sun, Nov 14, 2010 at 7:12 PM, Daniel Becroft 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 >

Merging case-only renames to branch

2010-11-14 Thread Daniel Becroft
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