Re: r16405, issue 2411, merge uses tmp file in current dir [was: Issue 767: Uses temporary files in current directory]
On 10/6/05, Julian Foad <email@example.com> wrote:
> Erik Huelsmann wrote:
> > I want to split issue 767 into its original purpose - the commit-tempfile - and
> > the merge problem. I don't think the merge problem is an incarnation of the
> > same problem; rather, I'm convinced the merge problem is a left-over from
> > issue 748 (svn merge only happens in ".").
> OK, and you did this, putting the "merge" issue in issue #2411.
> > I have the included patch sitting in my working copy, which fixes the merge
> > part of the issue.
> You committed this in r16405, but I'm reviewing it anyway.
> > [[[
> > Fix merge of added files using the current working directory for temp files.
> That sentence is rather hard to parse. I read it as "Fix the merging of added
> files, by using...".
> It should also refer to fixing issue #2411.
> > * subversion/libsvn_client/repos_diff.c
> > (create_empty_file): Create a temporary in the adm_access temp
> > dir if we have a write lock, use a temp dir otherwise.
> "Use a temp dir otherwise"? It uses a temp dir in either case. How about "a
> system temp dir" or "a global temp dir"?
> > (get_empty_file, apply_text_delta): Update to new calling convention
> > for create_empty_file().
> > ]]]
> The code looks fine.
Thanks for the review. I changed it.
Received on Thu Oct 6 22:16:21 2005
This is an archived mail posted to the Subversion Dev