You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/12/06 14:12:36 UTC
svn commit: r1417823 - /subversion/trunk/subversion/libsvn_wc/props.c
Author: julianfoad
Date: Thu Dec 6 13:12:35 2012
New Revision: 1417823
URL: http://svn.apache.org/viewvc?rev=1417823&view=rev
Log:
* subversion/libsvn_wc/props.c
(svn_wc__perform_props_merge): In some ifdef'd-out code, track a rename
that was done in r1095914.
Modified:
subversion/trunk/subversion/libsvn_wc/props.c
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1417823&r1=1417822&r2=1417823&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Thu Dec 6 13:12:35 2012
@@ -342,11 +342,11 @@ svn_wc__perform_props_merge(svn_wc_notif
/* See props.h */
#ifdef SVN__SUPPORT_BASE_MERGE
if (status == svn_wc__db_status_added)
- SVN_ERR(svn_wc__db_temp_working_set_props(db, local_abspath,
- new_base_props, scratch_pool));
+ SVN_ERR(svn_wc__db_temp_working_set_props(
+ db, local_abspath, new_pristine_props, scratch_pool));
else
- SVN_ERR(svn_wc__db_temp_base_set_props(db, local_abspath,
- new_base_props, scratch_pool));
+ SVN_ERR(svn_wc__db_temp_base_set_props(
+ db, local_abspath, new_pristine_props, scratch_pool));
#else
if (base_merge)
return svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL,