1) Include files for NG were neither recursively processes nor accumulated.

[helm.git] / helm / software / components / grafite / grafiteAst.ml

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 524f99dc2ff389356bb1de7b2f586f3cd3cf9a1e..e807c6f48eacca783e51be27210bb30cde4adc23 100644 (file)
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -188,7 +188,7 @@ type ('term,'lazy_term) macro =
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 24
+let magic = 25
 
 type ('term,'obj) command =
   | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
@@ -200,7 +200,7 @@ type ('term,'obj) command =
   | Inverter of loc * string * 'term * bool list
   | Default of loc * string * UriManager.uri list
   | Drop of loc
-  | Include of loc * bool (* normal? *) * string 
+  | Include of loc * bool (* normal? *) * [`New | `OldAndNew] * string 
   | Obj of loc * 'obj
   | Relation of
      loc * string * 'term * 'term * 'term option * 'term option * 'term option