Merge branch 'eb/apply' into next

diff --git a/revision.h b/revision.h
index 61e6bc9f4b12973b7faa69f63cb6986e9e19a080..83d28d520557ae37eea59dd7446e46edb6ef7cf6 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -7,6 +7,7 @@
 #define SHOWN          (1u<<3)
 #define TMP_MARK       (1u<<4) /* for isolated cases; clean after use */
 #define BOUNDARY       (1u<<5)
+#define ADDED          (1u<<6) /* Parents already parsed and added? */
 
 struct rev_info;
 
@@ -34,7 +35,8 @@ struct rev_info {
                        edge_hint:1,
                        limited:1,
                        unpacked:1,
-                       boundary:1;
+                       boundary:1,
+                       parents:1;
 
        /* special limits */
        int max_count;