svn commit: r1727724 - /subversion/trunk/subversion/libsvn_client/resolved.c

[st...@apache.org]

Author: stsp
Date: Sat Jan 30 16:41:37 2016
New Revision: 1727724

URL: http://svn.apache.org/viewvc?rev=1727724&view=rev
Log:
* subversion/libsvn_client/resolved.c
  (prop_conflicts): Allow 'base', 'mine-conflict', and 'theirs-conflict'
   for property conflicts because libsvn_wc supports this.
   At present, libsvn_wc treats 'mine-conflict' and 'theirs-conflict'
   just like 'mine-full' and 'theirs-full'. For backwards compat we should
   keep accepting them, and perhaps we'll decide to make 'mine-conflict'
   and 'theirs-conflict' do something different in the future.

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

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1727724&r1=1727723&r2=1727724&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Sat Jan 30 16:41:37 2016
@@ -903,6 +903,13 @@ static const svn_client_conflict_option_
   },
 
   {
+    svn_client_conflict_option_base_text,
+    N_("discard local and incoming changes for this property"),
+    NULL,
+    resolve_text_conflict
+  },
+
+  {
     svn_client_conflict_option_incoming_text,
     N_("accept incoming version of entire property value"),
     NULL,
@@ -915,6 +922,20 @@ static const svn_client_conflict_option_
     NULL,
     resolve_prop_conflict
   },
+
+  {
+    svn_client_conflict_option_incoming_text_where_conflicted,
+    N_("accept changes only where they conflict"),
+    NULL,
+    resolve_prop_conflict
+  },
+
+  {
+    svn_client_conflict_option_working_text_where_conflicted,
+    N_("reject changes which conflict and accept the rest"),
+    NULL,
+    resolve_prop_conflict
+  },
 
   {
     svn_client_conflict_option_merged_text,