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 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). > > --- Merging r4 through r5 into '.': > A A\alpha.txt > D A\ALPHA.TXT > Sending . > Deleting A\ALPHA.TXT > Adding A\alpha.txt > svn: Commit succeeded, but other errors follow: > svn: Error bumping revisions post-commit (details follow): > svn: In directory 'D:\temp\svn_sandpit\workingcopy\branchA\A' > svn: Error processing command 'committed' in > 'D:\temp\svn_sandpit\workingcopy\branchA\A' > svn: Error getting 'affected time' for > 'D:\temp\svn_sandpit\workingcopy\branchA\A\.svn\text-base\alpha.txt.svn-base' > svn: Can't stat > 'D:\temp\svn_sandpit\workingcopy\branchA\A\.svn\text-base\alpha.txt.svn-base': > The system cannot find the file specified. > > Interestingly, if I change my reproduction script to rename from alpha.txt > to ALPHA.txt, the commit works correctly. > > --- Merging r4 through r5 into '.': > A A\ALPHA.TXT > D A\alpha.txt > Sending . > Adding A\ALPHA.TXT > Deleting A\alpha.txt > Committed revision 6. > > My question(s) are: > 1) How should a merge of a case-only rename be managed? Is it a matter of > merging up to rX, manually renaming in the branch, recording the merge for > rX, then merging the rest? Or is there a cleaner method? > 2) Should the order of the rename actually matter? In the above example(s) > renaming of UPPER to lower caused the error, but renaming from lower to > UPPER did not. > > The same script (running using an old build of 1.7) gives the following > message: > > --- Merging r4 through r5 into '.': > A A\alpha.txt > D A\ALPHA.TXT > --- Recording mergeinfo for merge of r4 through r5 into '.': > U . > Sending . > Deleting A\ALPHA.TXT > Adding A\alpha.txt > svn: Commit succeeded, but other errors follow: > svn: Error bumping revisions post-commit (details follow): > svn: Error processing post-commit work for > 'D:\temp\svn_sandpit\workingcopy\branchA\A\alpha.txt' > svn: File 'D:\temp\svn_sandpit\workingcopy\branchA\A\alpha.txt' has no text > base > > Different wording, but same problem. > --- > Daniel Becroft
