subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1499064 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Tue, 02 Jul 2013 19:12:35 GMT
Author: stsp
Date: Tue Jul  2 19:12:34 2013
New Revision: 1499064

URL: http://svn.apache.org/r1499064
Log:
Fix issue #4387: Regression: svn merge --record-only errors out on renamed path

* subversion/libsvn_client/merge.c
  (record_tree_conflict): Don't record a conflict during record-only merges.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1499064&r1=1499063&r2=1499064&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jul  2 19:12:34 2013
@@ -1307,6 +1307,9 @@ record_tree_conflict(merge_cmd_baton_t *
 {
   svn_wc_context_t *wc_ctx = merge_b->ctx->wc_ctx;
 
+  if (merge_b->record_only)
+    return SVN_NO_ERROR;
+
   if (merge_b->merge_source.ancestral
       || merge_b->reintegrate_merge)
     {
@@ -1316,8 +1319,7 @@ record_tree_conflict(merge_cmd_baton_t *
   alloc_and_store_path(&merge_b->conflicted_paths, local_abspath,
                        merge_b->pool);
 
-
-  if (!merge_b->record_only && !merge_b->dry_run)
+  if (!merge_b->dry_run)
     {
        svn_wc_conflict_description3_t *conflict;
        const svn_wc_conflict_version_t *left;



Mime
View raw message