Re: [PATCH] syntax errors in svn schema files

[Julian Foad <ju...@btopenworld.com>]

Stephen Butler wrote:
> While extending svn's XML output for tree conflicts, I ran into a
> couple of simple bugs in the RelaxNG XML schema files (when
> running them in Jing release 20030619).  The errors are corrected
> by the attached patch.

Thanks, Steve. Committed in r29058. Apologies for the delay.

- Julian


> [[[
> Fix syntax errors in RelaxNG schema files for svn output.
> 
> * subversion/svn/schema/status.rnc
>   The second 'target' declaration should be named 'changelist'.
> 
> * subversion/svn/schema/diff.rnc
>   The text was doubled, for some reason.
>   The 'diff' element was not declared.
> ]]]
> Index: subversion/svn/schema/status.rnc
> ===================================================================
> --- subversion/svn/schema/status.rnc	(revision 442)
> +++ subversion/svn/schema/status.rnc	(working copy)
> @@ -16,7 +16,7 @@
>    ## The target path.
>    attribute path { string }
>  
> -target = element changelist { attlist.changelist, entry*, against? }
> +changelist = element changelist { attlist.changelist, entry*, against? }
>  attlist.changelist &=
>    ## The changelist name.
>    attribute name { string }
> Index: subversion/svn/schema/diff.rnc
> ===================================================================
> --- subversion/svn/schema/diff.rnc	(revision 435)
> +++ subversion/svn/schema/diff.rnc	(working copy)
> @@ -5,25 +5,8 @@
>  
>  start = diff
>  
> -paths = element paths { path* }
> +diff = element diff { paths }
>  
> -## A path entry
> -path = element path { attlist.path, text }
> -attlist.path &=
> -  ## The props of the entry.
> -  attribute props { "none" | "modified" },
> -  ## The kind of the entry.
> -  attribute kind { "dir" | "file" },
> -  ## The action performed against this path.  This terminology
> -  ## was chosen for consistencey from 'svn list'.
> -  attribute item { "none" | "added" | "modified" | "deleted" }
> -# XML RELAX NG schema for Subversion command-line client output
> -# For "svn diff --summarize --xml"
> -
> -include "common.rnc"
> -
> -start = diff
> -
>  paths = element paths { path* }
>  
>  ## A path entry

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org