subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1619096 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_wc/conflicts.c
Date Wed, 20 Aug 2014 13:06:59 GMT
Author: stsp
Date: Wed Aug 20 13:06:58 2014
New Revision: 1619096

URL: http://svn.apache.org/r1619096
Log:
In svn_wc_conflict_description2_t, provide a copy of the property reject file
path in new prop_reject_abspath field.

* subversion/include/svn_wc.h
  (svn_wc_conflict_description2_t): Add prop_reject_abspath. This path was
   accidentally stored in their_abspath, which is wrong but cannot be
   changed without rev'ing the struct.

* subversion/libsvn_wc/conflicts.c
  (generate_propconflict, read_prop_conflict_descs): Set prop_reject_abspath
   in addition to their_abspath. Both fields point to the same value.

Modified:
    subversion/trunk/subversion/include/svn_wc.h
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1619096&r1=1619095&r2=1619096&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Wed Aug 20 13:06:58 2014
@@ -1857,6 +1857,10 @@ typedef struct svn_wc_conflict_descripti
   /** Info on the "merge-right source" or "their" version of incoming change. */
   const svn_wc_conflict_version_t *src_right_version;
 
+  /* For property conflicts, the absolute path to the .prej file.
+   * @since New in 1.9. */
+  const char *prop_reject_abspath;
+
   /* NOTE: Add new fields at the end to preserve binary compatibility.
      Also, if you add fields here, you have to update
      svn_wc_conflict_description2_dup and perhaps

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1619096&r1=1619095&r2=1619096&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Wed Aug 20 13:06:58 2014
@@ -1398,9 +1398,7 @@ generate_propconflict(svn_boolean_t *con
           svn_diff_file_options_t *options =
             svn_diff_file_options_create(scratch_pool);
 
-          /* ### For property conflicts, cd2 stores prop_reject_abspath in
-           * ### their_abspath, and stores theirs_abspath in merged_file. */
-          SVN_ERR(svn_stream_open_unique(&mergestream, &cdesc->their_abspath,
+          SVN_ERR(svn_stream_open_unique(&mergestream, &cdesc->prop_reject_abspath,
                                          NULL, svn_io_file_del_on_pool_cleanup,
                                          scratch_pool, scratch_pool));
           SVN_ERR(svn_diff_mem_string_diff3(&diff, conflict_base_val,
@@ -1412,6 +1410,10 @@ generate_propconflict(svn_boolean_t *con
                    svn_diff_conflict_display_modified_latest,
                    cancel_func, cancel_baton, scratch_pool));
           SVN_ERR(svn_stream_close(mergestream));
+
+          /* ### For property conflicts, cd2 stores prop_reject_abspath in
+           * ### their_abspath, and stores theirs_abspath in merged_file. */
+          cdesc->their_abspath = cdesc->prop_reject_abspath;
         }
     }
 
@@ -2165,7 +2167,8 @@ read_prop_conflict_descs(apr_array_heade
 
       /* ### For property conflicts, cd2 stores prop_reject_abspath in
        * ### their_abspath, and stores theirs_abspath in merged_file. */
-      desc->their_abspath = apr_pstrdup(result_pool, prop_reject_file);
+      desc->prop_reject_abspath = apr_pstrdup(result_pool, prop_reject_file);
+      desc->their_abspath = desc->prop_reject_abspath;
 
       desc->operation = operation;
       desc->src_left_version = left_version;
@@ -2222,7 +2225,8 @@ read_prop_conflict_descs(apr_array_heade
 
       /* ### For property conflicts, cd2 stores prop_reject_abspath in
        * ### their_abspath, and stores theirs_abspath in merged_file. */
-      desc->their_abspath = apr_pstrdup(result_pool, prop_reject_file);
+      desc->prop_reject_abspath = apr_pstrdup(result_pool, prop_reject_file);
+      desc->their_abspath = desc->prop_reject_abspath;
 
       /* ### This should be changed. The conflict description for
        * ### props should contain these values as svn_string_t,



Mime
View raw message