tests/test-evolve-templates.t
branchmercurial-5.0
changeset 4863 5cd7d16b8733
parent 4777 ff452675566c
parent 4860 015cdd3fa469
child 4866 2a500c5e293b
child 4968 d299af4da8d8
equal deleted inserted replaced
4862:40795751be1c 4863:5cd7d16b8733
   279   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   279   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   280   adding a
   280   adding a
   281   adding b
   281   adding b
   282   diff --git a/a b/a
   282   diff --git a/a b/a
   283   new file mode 100644
   283   new file mode 100644
   284   examine changes to 'a'?
   284   examine changes to 'a'? [Ynesfdaq?] y
   285   (enter ? for help) [Ynesfdaq?] y
       
   286   
   285   
   287   @@ -0,0 +1,1 @@
   286   @@ -0,0 +1,1 @@
   288   +42
   287   +42
   289   record change 1/2 to 'a'?
   288   record change 1/2 to 'a'? [Ynesfdaq?] y
   290   (enter ? for help) [Ynesfdaq?] y
       
   291   
   289   
   292   diff --git a/b b/b
   290   diff --git a/b b/b
   293   new file mode 100644
   291   new file mode 100644
   294   examine changes to 'b'?
   292   examine changes to 'b'? [Ynesfdaq?] n
   295   (enter ? for help) [Ynesfdaq?] n
       
   296   
   293   
   297   created new head
   294   created new head
   298   continue splitting? [Ycdq?] y
   295   continue splitting? [Ycdq?] y
   299   diff --git a/b b/b
   296   diff --git a/b b/b
   300   new file mode 100644
   297   new file mode 100644
   301   examine changes to 'b'?
   298   examine changes to 'b'? [Ynesfdaq?] y
   302   (enter ? for help) [Ynesfdaq?] y
       
   303   
   299   
   304   @@ -0,0 +1,1 @@
   300   @@ -0,0 +1,1 @@
   305   +43
   301   +43
   306   record this change to 'b'?
   302   record this change to 'b'? [Ynesfdaq?] y
   307   (enter ? for help) [Ynesfdaq?] y
       
   308   
   303   
   309   no more change to split
   304   no more change to split
   310 
   305 
   311   $ hg log --hidden -G
   306   $ hg log --hidden -G
   312   @  changeset:   3:f257fde29c7a
   307   @  changeset:   3:f257fde29c7a