# 
# 
# patch "revision_lexer.mll"
#  from [8794cf0f4cddd99ce5bdfea003e411cae37be58b]
#    to [7ecc9cd062137b3e4b4455f85c75f10cc2c0c65a]
# 
# patch "revision_parser.mly"
#  from [31c33ffdabe1325f6ff8025b0bcfcadc90cd14b5]
#    to [47c1e0409bb988b2888a88f8f02b7e2f6b783a90]
# 
============================================================
--- revision_lexer.mll	8794cf0f4cddd99ce5bdfea003e411cae37be58b
+++ revision_lexer.mll	7ecc9cd062137b3e4b4455f85c75f10cc2c0c65a
@@ -15,8 +15,10 @@
 	"from", FROM;
 	"to", TO;
         "add_file", ADD_FILE;
+        "delete", DELETE_FILE;
         "delete_file", DELETE_FILE;
         "delete_dir", DELETE_DIR;
+        "rename", RENAME_FILE;
         "rename_file", RENAME_FILE;
         "rename_dir", RENAME_DIR; ]
 }
============================================================
--- revision_parser.mly	31c33ffdabe1325f6ff8025b0bcfcadc90cd14b5
+++ revision_parser.mly	47c1e0409bb988b2888a88f8f02b7e2f6b783a90
@@ -1,9 +1,10 @@
 %token FORMAT_VERSION
 %token NEW_MANIFEST OLD_REVISION OLD_MANIFEST
 %token PATCH
 %token CONTENT FROM TO
-%token ADD_FILE DELETE_FILE DELETE_DIR
-%token RENAME_FILE RENAME_DIR
+%token ADD_FILE 
+%token DELETE DELETE_FILE DELETE_DIR
+%token RENAME RENAME_FILE RENAME_DIR
 %token EOF
 %token <string> ID STRING
 
@@ -42,8 +43,10 @@
   | PATCH STRING FROM ID TO ID          { Revision_types.PATCH ($2, $4, $6) }
   | ADD_FILE STRING                     { Revision_types.ADD_FILE ($2, "") }
   | ADD_FILE STRING CONTENT ID          { Revision_types.ADD_FILE ($2, $4) }
+  | DELETE STRING                       { Revision_types.DELETE_FILE $2 }
   | DELETE_FILE STRING                  { Revision_types.DELETE_FILE $2 }
   | DELETE_DIR STRING                   { Revision_types.DELETE_DIR $2 }
+  | RENAME STRING TO STRING             { Revision_types.RENAME_FILE ($2, $4) }
   | RENAME_FILE STRING TO STRING        { Revision_types.RENAME_FILE ($2, $4) }
   | RENAME_DIR STRING TO STRING         { Revision_types.RENAME_DIR ($2, $4) }
 ;