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 2013/05/01 16:14:40 UTC
svn commit: r1478010 - in /subversion/branches/1.8.x-r1477876: ./
subversion/libsvn_wc/conflicts.c
Author: julianfoad
Date: Wed May 1 14:14:40 2013
New Revision: 1478010
URL: http://svn.apache.org/r1478010
Log:
On the 1.8.x-r1477876 branch: merge r1477876 from trunk, resolving conflicts.
Modified:
subversion/branches/1.8.x-r1477876/ (props changed)
subversion/branches/1.8.x-r1477876/subversion/libsvn_wc/conflicts.c
Propchange: subversion/branches/1.8.x-r1477876/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1477876
Modified: subversion/branches/1.8.x-r1477876/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1477876/subversion/libsvn_wc/conflicts.c?rev=1478010&r1=1478009&r2=1478010&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1477876/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/branches/1.8.x-r1477876/subversion/libsvn_wc/conflicts.c Wed May 1 14:14:40 2013
@@ -2047,6 +2047,9 @@ svn_wc__conflict_invoke_resolver(svn_wc_
* If NOT create_tempfiles, always create a legacy property conflict
* descriptor.
*
+ * Use NODE_KIND, OPERATION and shallow copies of LEFT_VERSION and
+ * RIGHT_VERSION, rather than reading them from CONFLICT_SKEL.
+ *
* Allocate results in RESULT_POOL. SCRATCH_POOL is used for temporary
* allocations. */
static svn_error_t *
@@ -2055,6 +2058,7 @@ read_prop_conflicts(apr_array_header_t *
const char *local_abspath,
svn_skel_t *conflict_skel,
svn_boolean_t create_tempfiles,
+ svn_node_kind_t node_kind,
svn_wc_operation_t operation,
const svn_wc_conflict_version_t *left_version,
const svn_wc_conflict_version_t *right_version,
@@ -2084,7 +2088,7 @@ read_prop_conflicts(apr_array_header_t *
svn_wc_conflict_description2_t *desc;
desc = svn_wc_conflict_description_create_prop2(local_abspath,
- svn_node_unknown,
+ node_kind,
"", result_pool);
/* ### This should be changed. The prej file should be stored
@@ -2115,7 +2119,7 @@ read_prop_conflicts(apr_array_header_t *
svn_pool_clear(iterpool);
desc = svn_wc_conflict_description_create_prop2(local_abspath,
- svn_node_unknown,
+ node_kind,
propname,
result_pool);
@@ -2246,10 +2250,15 @@ svn_wc__read_conflicts(const apr_array_h
right_version = APR_ARRAY_IDX(locations, 1, const svn_wc_conflict_version_t *);
if (prop_conflicted)
- SVN_ERR(read_prop_conflicts(cflcts, db, local_abspath, conflict_skel,
- create_tempfiles,
- operation, left_version, right_version,
- result_pool, scratch_pool));
+ {
+ svn_node_kind_t node_kind
+ = left_version ? left_version->node_kind : svn_node_unknown;
+
+ SVN_ERR(read_prop_conflicts(cflcts, db, local_abspath, conflict_skel,
+ create_tempfiles, node_kind,
+ operation, left_version, right_version,
+ result_pool, scratch_pool));
+ }
if (text_conflicted)
{