Author: ivan
Date: Tue Oct 11 10:37:10 2016
New Revision: 1764221

URL: http://svn.apache.org/viewvc?rev=1764221&view=rev
Log:
Fix minor bug in property conflict interactive resolver.

* subversion/svn/conflict-callbacks.c
  (merge_prop_conflict): Check THEIR_PROPVAL for NULL instead of checking
   MY_PROPVAL twice.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1764221&r1=1764220&r2=1764221&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Tue Oct 11 10:37:10 
2016
@@ -229,8 +229,8 @@ merge_prop_conflict(svn_stream_t *output
     base_propval = svn_string_create_empty(pool);
   if (my_propval == NULL)
     my_propval = svn_string_create_empty(pool);
-  if (my_propval == NULL)
-    my_propval = svn_string_create_empty(pool);
+  if (their_propval == NULL)
+    their_propval = svn_string_create_empty(pool);
     
   options->ignore_eol_style = TRUE;
   SVN_ERR(svn_diff_mem_string_diff3(&diff, base_propval,


Reply via email to