On Tue, Jul 10, 2012 at 11:19 AM, Philip Martin <philip.mar...@wandisco.com> wrote: > 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.)
Ok, so IIUC if 'merge' would use the internal .svn temporary dir this would be fixed, right? Because we can assume that things won't suddenly dissapear from .svn/tmp, even between invocations -- and if they do, something/someone has messed with svn metadata internals, which isn't allowed (except if you *want* to corrupt things of course :-)). Makes me wonder: what if some crap stays behind in .svn/tmp (for whatever reason -- I just checked my working copies, and in one of them there are two old svn-XXXXXX files in the tmp dir). Does cleanup clean those up (after it has verified that they are not needed anymore)? -- Johan
