tests/test-evolve-templates.t
branchmercurial-5.0
changeset 5280 90fbbc29b93a
parent 5159 e5fe3ca5e6ad
child 5162 a7fb433faab6
child 5364 be5aa681c122
equal deleted inserted replaced
5279:35e769c9604f 5280:90fbbc29b93a
   281   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   281   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   282   adding a
   282   adding a
   283   adding b
   283   adding b
   284   diff --git a/a b/a
   284   diff --git a/a b/a
   285   new file mode 100644
   285   new file mode 100644
   286   examine changes to 'a'?
   286   examine changes to 'a'? [Ynesfdaq?] y
   287   (enter ? for help) [Ynesfdaq?] y
       
   288   
   287   
   289   @@ -0,0 +1,1 @@
   288   @@ -0,0 +1,1 @@
   290   +42
   289   +42
   291   record change 1/2 to 'a'?
   290   record change 1/2 to 'a'? [Ynesfdaq?] y
   292   (enter ? for help) [Ynesfdaq?] y
       
   293   
   291   
   294   diff --git a/b b/b
   292   diff --git a/b b/b
   295   new file mode 100644
   293   new file mode 100644
   296   examine changes to 'b'?
   294   examine changes to 'b'? [Ynesfdaq?] n
   297   (enter ? for help) [Ynesfdaq?] n
       
   298   
   295   
   299   created new head
   296   created new head
   300   continue splitting? [Ycdq?] y
   297   continue splitting? [Ycdq?] y
   301   diff --git a/b b/b
   298   diff --git a/b b/b
   302   new file mode 100644
   299   new file mode 100644
   303   examine changes to 'b'?
   300   examine changes to 'b'? [Ynesfdaq?] y
   304   (enter ? for help) [Ynesfdaq?] y
       
   305   
   301   
   306   @@ -0,0 +1,1 @@
   302   @@ -0,0 +1,1 @@
   307   +43
   303   +43
   308   record this change to 'b'?
   304   record this change to 'b'? [Ynesfdaq?] y
   309   (enter ? for help) [Ynesfdaq?] y
       
   310   
   305   
   311   no more change to split
   306   no more change to split
   312 
   307 
   313   $ hg log --hidden -G
   308   $ hg log --hidden -G
   314   @  changeset:   3:f257fde29c7a
   309   @  changeset:   3:f257fde29c7a