[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: r16405, issue 2411, merge uses tmp file in current dir [was: Issue 767: Uses temporary files in current directory]

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2005-10-06 15:21:41 CEST

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.

- Julian

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 6 15:23:09 2005

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.