You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/11/07 13:24:26 UTC
svn commit: r1406583 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: stsp
Date: Wed Nov 7 12:24:26 2012
New Revision: 1406583
URL: http://svn.apache.org/viewvc?rev=1406583&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(tc_editor_alter_file): Use the known working copy root abspath as
wri_abspath argument to db_pristine_get_path(), rather than using
the abspath of the move destination.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1406583&r1=1406582&r2=1406583&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Wed Nov 7 12:24:26 2012
@@ -167,11 +167,11 @@ tc_editor_alter_file(void *baton,
* moved-here working file as the merge-right version.
*/
SVN_ERR(svn_wc__db_pristine_get_path(&pre_update_pristine_abspath,
- b->db, moved_to_abspath,
+ b->db, b->wcroot->abspath,
move_dst_checksum,
scratch_pool, scratch_pool));
SVN_ERR(svn_wc__db_pristine_get_path(&post_update_pristine_abspath,
- b->db, moved_to_abspath,
+ b->db, b->wcroot->abspath,
move_src_checksum,
scratch_pool, scratch_pool));
SVN_ERR(svn_wc__internal_merge(b->work_items, &conflict_skel,