[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: Branko Čibej <brane_at_xbc.nu>
Date: 2005-09-26 21:43:05 CEST

Erik Huelsmann wrote:

>'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.
>
>The diff-editor doesn't know whether it's driving a merge or a diff,
>meaning that there is no way to keep the old behaviour for diff and
>the new one for merge. Is it acceptable for diff to start requiring
>write access to the .svn/tmp areas in order to solve the problem with
>merge?
>
>
AFAIK diff already writes to .svn/tmp in order to create detranslated
versions of the files modified in the WC.

-- Brane

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 26 21:44:01 2005

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