Author: rhuijben
Date: Tue Jun 15 11:55:50 2010
New Revision: 954844
URL: http://svn.apache.org/viewvc?rev=954844&view=rev
Log:
Small followup on r954789, use svn_io_move() instead of svn_io_rename()
to fix an 'across device boundaries' error.
* subversion/libsvn_client/merge.c
(merge_file_changed): Use svn_io_move().
Found by: neels
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=954844&r1=954843&r2=954844&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jun 15 11:55:50 2010
@@ -1461,8 +1461,8 @@ merge_file_changed(const char *local_dir
{
if (older_revision_exists && !merge_b->dry_run)
{
- SVN_ERR(svn_io_file_rename(yours_abspath, mine_abspath,
- subpool));
+ SVN_ERR(svn_io_file_move(yours_abspath, mine_abspath,
+ subpool));
}
merge_outcome = svn_wc_merge_merged;
merge_required = FALSE;
