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

Re: Merge tries to move added file across devices

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2005-09-28 10:20:41 CEST

On 26 Sep 2005 13:59:36 -0500, kfogel@collab.net <kfogel@collab.net> wrote:
> Erik Huelsmann <ehuels@gmail.com> writes:
> > 'svn merge' and 'svn diff' share the same implementation for receiving
> > added files from the repository, which uses
> > libsvn_client/repos_diff.c:create_empty_file().
> >
> > The create_empty_file() routine prefers the cwd to create its
> > temporaries in. Which is fine for diff (probably), but is a problem
> > for merge if the cwd is on a different device than the target working
> > copy.

> Isn't this what http://subversion.tigris.org/issues/show_bug.cgi?id=767
> is about? (You've commented extensively in that issue, actually.)

Well, I think it isn't what it was about, though in its course of life
it has been added. I think that's wrong. Whether or not to use the cwd
for a commit log message is an entirely different issue than how and
where merge/diff create their files.

If you don't mind, I'll be splitting the issue, leaving the original
as 'Commit uses temporary file in cwd' and moving the merge issue into
'Merging added file can result in cross device rename'.

It's the latter issue I want to fix.

BTW: There's a remark in libsvn_client/repos_diff.c that merge does
not support other than the . target. This isn't true anymore, would
you mind helping screening the file for problems resulting from this

Anyway, thanks for your input.


Received on Wed Sep 28 10:22:00 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.