> -----Original Message----- > From: Bert Huijben [mailto:b...@qqmail.nl] > Sent: dinsdag 10 juli 2012 16:52 > To: 'Philip Martin'; 'Johan Corveleyn' > Cc: 'Dave Huang'; users@subversion.apache.org > Subject: RE: "svn cleanup" fails because it can't find a temp file > > > > > -----Original Message----- > > From: MARTIN PHILIP [mailto:codematt...@ntlworld.com] On Behalf Of > > Philip Martin > > Sent: dinsdag 10 juli 2012 11:20 > > To: Johan Corveleyn > > Cc: Dave Huang; users@subversion.apache.org > > Subject: Re: "svn cleanup" fails because it can't find a temp file > > > > Johan Corveleyn <jcor...@gmail.com> writes: > > > > > I think you should file an issue for the unrecoverable working copy > > > after a "blocked by file-in-use" reverse-merge (maybe also for a > > > normal merge?). It would be nice though if you could come up with a > > > nice reproduction recipe, > > > > Just about any merge will do. repos_diff.c:get_file_from_ra passes NULL > > when calling svn_stream_open_unique and that causes the system > > temporary > > dir to be used--we should be passing the .svn temporary dir. (We should > > probably continue to pass NULL if this is a diff, rather than a merge, > > since the working copy might be read-only.) > > Other part of this problem: shouldn't the install operation be ignored if > the to-be installed file cannot be found? > > The workqueue operation should be restartable, which it won't be if the file > is already moved, but some later operation (like obtaining the timestamp) > fails.
The most likely cause for this issue (svn merge applying a 'trivial' merge), is now fixed on trunk and the fix is nominated for backport in r1361119. The less trivial merges already had a similar code path that 'fixed' this problem. Bert