subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1420742 - /subversion/trunk/subversion/libsvn_wc/props.c
Date Wed, 12 Dec 2012 15:14:23 GMT
Author: julianfoad
Date: Wed Dec 12 15:14:22 2012
New Revision: 1420742

URL: http://svn.apache.org/viewvc?rev=1420742&view=rev
Log:
* subversion/libsvn_wc/props.c
  (svn_wc__perform_props_merge): A follow-up to r1417926: fix an assertion
    failure.

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=1420742&r1=1420741&r2=1420742&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Wed Dec 12 15:14:22 2012
@@ -337,16 +337,20 @@ svn_wc__perform_props_merge(svn_wc_notif
     SVN_ERR(svn_wc__write_check(db, dir_abspath, scratch_pool));
 
     /* After a (not-dry-run) merge, we ALWAYS have props to save.  */
-    SVN_ERR_ASSERT(new_pristine_props != NULL && new_actual_props != NULL);
+    SVN_ERR_ASSERT(new_pristine_props != NULL);
 
 /* 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_pristine_props, scratch_pool));
-    else
-      SVN_ERR(svn_wc__db_temp_base_set_props(
-                db, local_abspath, new_pristine_props, scratch_pool));
+    if (base_merge)
+      {
+        SVN_ERR_ASSERT(new_actual_props != NULL);
+        if (status == svn_wc__db_status_added)
+          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_pristine_props, scratch_pool));
+      }
 #else
     if (base_merge)
       return svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL,



Mime
View raw message