svn commit: r1366139 - in /subversion/trunk/subversion/libsvn_wc: conflicts.c props.c

[rh...@apache.org]

Author: rhuijben
Date: Thu Jul 26 18:36:28 2012
New Revision: 1366139

URL: http://svn.apache.org/viewvc?rev=1366139&view=rev
Log:
Fix two small conflict skel handling issues that made resolve_tests.py
prop_conflict_resolution test fail much earlier than expected.

* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_create_markers): Pick the right hashtable as old-props,
    when handling an update or switch conflict.

* subversion/libsvn_wc/props.c
  (svn_wc__merge_props): Duplicate the pristine props for storing in the
    conflict as we are going to edit the pristine hash in some cases.
    Document a few variables.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c
    subversion/trunk/subversion/libsvn_wc/props.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1366139&r1=1366138&r2=1366139&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Jul 26 18:36:28 2012
@@ -1155,7 +1155,7 @@ svn_wc__conflict_create_markers(svn_skel
           SVN_ERR(svn_wc__db_read_pristine_props(&old_props, db, local_abspath,
                                                  scratch_pool, scratch_pool));
         else
-          old_props = their_props;
+          old_props = their_original_props;
 
         prop_data = prop_conflict_skel_new(result_pool);
 

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1366139&r1=1366138&r2=1366139&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Thu Jul 26 18:36:28 2012
@@ -1207,7 +1207,7 @@ svn_wc__merge_props(svn_skel_t **conflic
   *new_actual_props = NULL;
 
   if (!server_baseprops)
-    server_baseprops = pristine_props;
+    server_baseprops = apr_hash_copy(scratch_pool, pristine_props);
 
   their_props = apr_hash_copy(scratch_pool, server_baseprops);
 
@@ -1227,7 +1227,9 @@ svn_wc__merge_props(svn_skel_t **conflic
       const char *propname;
       svn_boolean_t conflict_remains;
       const svn_prop_t *incoming_change;
-      const svn_string_t *from_val, *to_val, *base_val;
+      const svn_string_t *base_val; /* Pristine in WC */
+      const svn_string_t *from_val; /* Merge left */
+      const svn_string_t *to_val; /* Merge right */
 
       svn_pool_clear(iterpool);