subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1463533 - /subversion/trunk/subversion/svn/schema/info.rnc
Date Tue, 02 Apr 2013 13:38:16 GMT
Author: julianfoad
Date: Tue Apr  2 13:38:15 2013
New Revision: 1463533

URL: http://svn.apache.org/r1463533
Log:
* subversion/svn/schema/info.rnc
  (attlist.tree-conflict): Add the 'action' and 'reason' values that are new
    in Subversion 1.7 and 1.8.

Modified:
    subversion/trunk/subversion/svn/schema/info.rnc

Modified: subversion/trunk/subversion/svn/schema/info.rnc
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/schema/info.rnc?rev=1463533&r1=1463532&r2=1463533&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/schema/info.rnc (original)
+++ subversion/trunk/subversion/svn/schema/info.rnc Tue Apr  2 13:38:15 2013
@@ -127,7 +127,8 @@ attlist.tree-conflict &=
   ## Operation causing the tree conflict.
   attribute operation { "update" | "merge" | "switch" },
   ## Operation's action on the victim.
-  attribute action { "edit" | "add" | "delete" },
+  attribute action { "edit" | "add" | "delete" | "replace" },
   ## Local reason for the conflict.
   attribute reason { "edit" | "obstruction" | "delete" | "add" |
-                     "missing" | "unversioned" }
+                     "missing" | "unversioned" | "replace" |
+                     "moved-away" | "moved-here" }



Mime
View raw message