Hi Alan. Thanks for this report, and sorry for the long time to respond.
I finally got around to converting your recipe into an executable script (on Linux) which is attached, and with this it is easy to reproduce the problem. On Thu, 2009-12-17, Alan Spencer wrote: > I've been asked to analyse a problem we have had with subversion and > come to the conclusion there is a bug in at least the client. > > > The scenario was someone committed a new directory that made a build > fail and in order to free up the build this commit was reverse merges > (merge -c -RRRR) > > The individual in question wanted their changes back and the opportunity > to fix the problem. This was done by reverse merging the reverse merge. > > They then fixed the problems, which included renaming a file. > > They then committed these changes and updated and all looked OK. > > Updating on other working copy showed that both the original and renamed > file existed, but the working copy used did not show this. > > > > I wanted to find out if this is user error or a bug and if it has been > logged already. This certainly looks like a bug. It sounds familiar, but I can't find it in the issue tracker. > And is there a way to achieve this without hitting this problem. I'm not sure. > Here is a log of my reproducing this: [...] > C:\dev\projects\build\build\svn-experiments\experiment-1>svn commit -m > "Revert revert and renaming svn merge -c -16666 . svn move > systemtest\audit\FirstName.txt systemtest\audit\SecondName.txt" . > Adding experiment-1\systemtest\audit > Adding experiment-1\systemtest\audit\SecondName.txt > Committed revision 16667. With a release candidate for 1.6.8, using the attached script, I get the same result as you. With a trunk build (r898816), using the attached script, I get a different problem here: the commit sort of fails: + svn commit -m 'Revert revert and renaming svn merge -c -16666 . svn move systemtest/audit/FirstName.txt systemtest/audit/SecondName.txt' . Adding experiment-1/systemtest/audit Deleting experiment-1/systemtest/audit/FirstName.txt Adding experiment-1/systemtest/audit/SecondName.txt svn: Commit succeeded, but other errors follow: svn: Error bumping revisions post-commit (details follow): svn: The node 'FirstName.txt' was not found. This is interesting, and it would be good to turn this script into a test in the test suite so that we remember to fix the bug. Any volunteers? - Julian > > UPDATE ELSEWHERE > ---------------------------------- > > C:\dev\CO\trunk>svn up build\svn-experiments\experiment-1\ > A build\svn-experiments\experiment-1\systemtest\audit > A build\svn-experiments\experiment-1\systemtest\audit\FirstName.txt > A build\svn-experiments\experiment-1\systemtest\audit\SecondName.txt > Updated to revision 16667.
AlanSpencer.sh
Description: application/shellscript
