tests/test-evolve-templates.t
branchmercurial-4.2
changeset 3108 9c9c8c1eeb93
parent 3106 a867d59ea97a
parent 3001 67b59d1657cf
child 3109 3024ae293732
child 3117 3e2abd40da07
equal deleted inserted replaced
3107:1f61525727bf 3108:9c9c8c1eeb93
    45   |
    45   |
    46   | x  changeset:   3:a468dc9b3633
    46   | x  changeset:   3:a468dc9b3633
    47   |/   parent:      0:ea207398892e
    47   |/   parent:      0:ea207398892e
    48   |    user:        test
    48   |    user:        test
    49   |    date:        Thu Jan 01 00:00:00 1970 +0000
    49   |    date:        Thu Jan 01 00:00:00 1970 +0000
    50   |    obsolete:    reworded as d004c8f274b9 by test2
       
    51   |    summary:     A1
    50   |    summary:     A1
    52   |
    51   |
    53   | x  changeset:   2:f137d23bb3e1
    52   | x  changeset:   2:f137d23bb3e1
    54   | |  user:        test
    53   | |  user:        test
    55   | |  date:        Thu Jan 01 00:00:00 1970 +0000
    54   | |  date:        Thu Jan 01 00:00:00 1970 +0000
    56   | |  obsolete:    pruned
       
    57   | |  summary:     temporary amend commit for 471f378eab4c
    55   | |  summary:     temporary amend commit for 471f378eab4c
    58   | |
    56   | |
    59   | x  changeset:   1:471f378eab4c
    57   | x  changeset:   1:471f378eab4c
    60   |/   user:        test
    58   |/   user:        test
    61   |    date:        Thu Jan 01 00:00:00 1970 +0000
    59   |    date:        Thu Jan 01 00:00:00 1970 +0000
    62   |    obsolete:    rewritten as a468dc9b3633
       
    63   |    summary:     A0
    60   |    summary:     A0
    64   |
    61   |
    65   o  changeset:   0:ea207398892e
    62   o  changeset:   0:ea207398892e
    66      user:        test
    63      user:        test
    67      date:        Thu Jan 01 00:00:00 1970 +0000
    64      date:        Thu Jan 01 00:00:00 1970 +0000
    77 Precursors template should show current revision as it is the working copy
    74 Precursors template should show current revision as it is the working copy
    78   $ hg olog tip
    75   $ hg olog tip
    79   o  d004c8f274b9 (4) A2
    76   o  d004c8f274b9 (4) A2
    80   |
    77   |
    81   x  a468dc9b3633 (3) A1
    78   x  a468dc9b3633 (3) A1
    82   |    rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000)
    79   |    rewritten(description) as d004c8f274b9 by test2 (*) (glob)
    83   |
    80   |
    84   @  471f378eab4c (1) A0
    81   @  471f378eab4c (1) A0
    85        rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000)
    82        rewritten(description, content) as a468dc9b3633 by test (*) (glob)
    86   
    83   
    87   $ hg tlog
    84   $ hg tlog
    88   o  d004c8f274b9
    85   o  d004c8f274b9
    89   |    Precursors: 1:471f378eab4c
    86   |    Precursors: 471f378eab4c
    90   |    semi-colon: 1:471f378eab4c
    87   |    semi-colon: 471f378eab4c
    91   | @  471f378eab4c
    88   | @  471f378eab4c
    92   |/     Successors: 4:d004c8f274b9
    89   |/     Successors: [d004c8f274b9]
    93   |      semi-colon: 4:d004c8f274b9
    90   |      semi-colon: [d004c8f274b9]
    94   |      Fate: rewritten as d004c8f274b9 by test, test2
    91   |      Fate: rewritten as d004c8f274b9 by test, test2
    95   |
    92   |
    96   o  ea207398892e
    93   o  ea207398892e
    97   
    94   
    98 
    95 
   105   |  summary:     A2
   102   |  summary:     A2
   106   |
   103   |
   107   | @  changeset:   1:471f378eab4c
   104   | @  changeset:   1:471f378eab4c
   108   |/   user:        test
   105   |/   user:        test
   109   |    date:        Thu Jan 01 00:00:00 1970 +0000
   106   |    date:        Thu Jan 01 00:00:00 1970 +0000
   110   |    obsolete:    rewritten as d004c8f274b9 by test, test2
       
   111   |    summary:     A0
   107   |    summary:     A0
   112   |
   108   |
   113   o  changeset:   0:ea207398892e
   109   o  changeset:   0:ea207398892e
   114      user:        test
   110      user:        test
   115      date:        Thu Jan 01 00:00:00 1970 +0000
   111      date:        Thu Jan 01 00:00:00 1970 +0000
   135   
   131   
   136   $ hg fatelog -v
   132   $ hg fatelog -v
   137   o  d004c8f274b9
   133   o  d004c8f274b9
   138   |
   134   |
   139   | @  471f378eab4c
   135   | @  471f378eab4c
   140   |/     Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
   136   |/     Obsfate: rewritten as d004c8f274b9 by test, test2 (*) (glob)
   141   |
   137   |
   142   o  ea207398892e
   138   o  ea207398892e
   143   
   139   
   144 
   140 
   145 (check json)
   141 (check json)
   166   (use 'hg evolve' to update to its successor: d004c8f274b9)
   162   (use 'hg evolve' to update to its successor: d004c8f274b9)
   167 
   163 
   168 Precursors template should show current revision as it is the working copy
   164 Precursors template should show current revision as it is the working copy
   169   $ hg tlog
   165   $ hg tlog
   170   o  d004c8f274b9
   166   o  d004c8f274b9
   171   |    Precursors: 3:a468dc9b3633
   167   |    Precursors: a468dc9b3633
   172   |    semi-colon: 3:a468dc9b3633
   168   |    semi-colon: a468dc9b3633
   173   | @  a468dc9b3633
   169   | @  a468dc9b3633
   174   |/     Successors: 4:d004c8f274b9
   170   |/     Successors: [d004c8f274b9]
   175   |      semi-colon: 4:d004c8f274b9
   171   |      semi-colon: [d004c8f274b9]
   176   |      Fate: reworded as d004c8f274b9 by test2
   172   |      Fate: reworded as d004c8f274b9 by test2
   177   |
   173   |
   178   o  ea207398892e
   174   o  ea207398892e
   179   
   175   
   180 Precursors template should show the precursor as we force its display with
   176 Precursors template should show the precursor as we force its display with
   181 --hidden  
   177 --hidden  
   182   $ hg tlog --hidden
   178   $ hg tlog --hidden
   183   o  d004c8f274b9
   179   o  d004c8f274b9
   184   |    Precursors: 3:a468dc9b3633
   180   |    Precursors: a468dc9b3633
   185   |    semi-colon: 3:a468dc9b3633
   181   |    semi-colon: a468dc9b3633
   186   | @  a468dc9b3633
   182   | @  a468dc9b3633
   187   |/     Precursors: 1:471f378eab4c
   183   |/     Precursors: 471f378eab4c
   188   |      semi-colon: 1:471f378eab4c
   184   |      semi-colon: 471f378eab4c
   189   |      Successors: 4:d004c8f274b9
   185   |      Successors: [d004c8f274b9]
   190   |      semi-colon: 4:d004c8f274b9
   186   |      semi-colon: [d004c8f274b9]
   191   |      Fate: reworded as d004c8f274b9 by test2
   187   |      Fate: reworded as d004c8f274b9 by test2
   192   |
   188   |
   193   | x  f137d23bb3e1
   189   | x  f137d23bb3e1
   194   | |    Fate: pruned
   190   | |    Fate: pruned
   195   | |
   191   | |
   196   | x  471f378eab4c
   192   | x  471f378eab4c
   197   |/     Successors: 3:a468dc9b3633
   193   |/     Successors: [a468dc9b3633]
   198   |      semi-colon: 3:a468dc9b3633
   194   |      semi-colon: [a468dc9b3633]
   199   |      Fate: rewritten as a468dc9b3633
   195   |      Fate: rewritten as a468dc9b3633
       
   196   |
       
   197   o  ea207398892e
       
   198   
       
   199   $ hg fatelog -v
       
   200   o  d004c8f274b9
       
   201   |
       
   202   | @  a468dc9b3633
       
   203   |/     Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
   200   |
   204   |
   201   o  ea207398892e
   205   o  ea207398892e
   202   
   206   
   203   $ hg up 'desc(A2)'
   207   $ hg up 'desc(A2)'
   204   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   208   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   207   |
   211   |
   208   o  ea207398892e
   212   o  ea207398892e
   209   
   213   
   210   $ hg tlog --hidden
   214   $ hg tlog --hidden
   211   @  d004c8f274b9
   215   @  d004c8f274b9
   212   |    Precursors: 3:a468dc9b3633
   216   |    Precursors: a468dc9b3633
   213   |    semi-colon: 3:a468dc9b3633
   217   |    semi-colon: a468dc9b3633
   214   | x  a468dc9b3633
   218   | x  a468dc9b3633
   215   |/     Precursors: 1:471f378eab4c
   219   |/     Precursors: 471f378eab4c
   216   |      semi-colon: 1:471f378eab4c
   220   |      semi-colon: 471f378eab4c
   217   |      Successors: 4:d004c8f274b9
   221   |      Successors: [d004c8f274b9]
   218   |      semi-colon: 4:d004c8f274b9
   222   |      semi-colon: [d004c8f274b9]
   219   |      Fate: reworded as d004c8f274b9 by test2
   223   |      Fate: reworded as d004c8f274b9 by test2
   220   |
   224   |
   221   | x  f137d23bb3e1
   225   | x  f137d23bb3e1
   222   | |    Fate: pruned
   226   | |    Fate: pruned
   223   | |
   227   | |
   224   | x  471f378eab4c
   228   | x  471f378eab4c
   225   |/     Successors: 3:a468dc9b3633
   229   |/     Successors: [a468dc9b3633]
   226   |      semi-colon: 3:a468dc9b3633
   230   |      semi-colon: [a468dc9b3633]
   227   |      Fate: rewritten as a468dc9b3633
   231   |      Fate: rewritten as a468dc9b3633
   228   |
   232   |
   229   o  ea207398892e
   233   o  ea207398892e
   230   
   234   
   231   $ hg fatelog -v
   235   $ hg fatelog -v
   236 
   240 
   237   $ hg fatelog -v --hidden
   241   $ hg fatelog -v --hidden
   238   @  d004c8f274b9
   242   @  d004c8f274b9
   239   |
   243   |
   240   | x  a468dc9b3633
   244   | x  a468dc9b3633
   241   |/     Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   245   |/     Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
   242   |
   246   |
   243   | x  f137d23bb3e1
   247   | x  f137d23bb3e1
   244   | |    Obsfate: pruned by test (at 2009-02-13 23:31 +0000)
   248   | |    Obsfate: pruned by test (at *) (glob)
   245   | |
   249   | |
   246   | x  471f378eab4c
   250   | x  471f378eab4c
   247   |/     Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
   251   |/     Obsfate: rewritten as a468dc9b3633 by test (*) (glob)
   248   |
   252   |
   249   o  ea207398892e
   253   o  ea207398892e
   250   
   254   
   251 
   255 
   252   $ hg fatelogjson --hidden
   256   $ hg fatelogjson --hidden
   253   @  d004c8f274b9 []
   257   @  d004c8f274b9 []
   254   |
   258   |
   255   | x  a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
   259   | x  a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] (glob)
   256   |/
   260   |/
   257   | x  f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test"], "verb": "pruned"}]
   261   | x  f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test"], "verb": "pruned"}] (glob)
   258   | |
   262   | |
   259   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}]
   263   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] (glob)
   260   |/
   264   |/
   261   o  ea207398892e []
   265   o  ea207398892e []
   262   
   266   
   263 
   267 
   264 Test templates with splitted commit
   268 Test templates with splitted commit
   333   |  summary:     A0
   337   |  summary:     A0
   334   |
   338   |
   335   | x  changeset:   1:471597cad322
   339   | x  changeset:   1:471597cad322
   336   |/   user:        test
   340   |/   user:        test
   337   |    date:        Thu Jan 01 00:00:00 1970 +0000
   341   |    date:        Thu Jan 01 00:00:00 1970 +0000
   338   |    obsolete:    split as 337fec4d2edc, f257fde29c7a
       
   339   |    summary:     A0
   342   |    summary:     A0
   340   |
   343   |
   341   o  changeset:   0:ea207398892e
   344   o  changeset:   0:ea207398892e
   342      user:        test
   345      user:        test
   343      date:        Thu Jan 01 00:00:00 1970 +0000
   346      date:        Thu Jan 01 00:00:00 1970 +0000
   353   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   356   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   354 
   357 
   355 Precursors template should show current revision as it is the working copy
   358 Precursors template should show current revision as it is the working copy
   356   $ hg tlog
   359   $ hg tlog
   357   o  f257fde29c7a
   360   o  f257fde29c7a
   358   |    Precursors: 1:471597cad322
   361   |    Precursors: 471597cad322
   359   |    semi-colon: 1:471597cad322
   362   |    semi-colon: 471597cad322
   360   o  337fec4d2edc
   363   o  337fec4d2edc
   361   |    Precursors: 1:471597cad322
   364   |    Precursors: 471597cad322
   362   |    semi-colon: 1:471597cad322
   365   |    semi-colon: 471597cad322
   363   | @  471597cad322
   366   | @  471597cad322
   364   |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
   367   |/     Successors: [337fec4d2edc, f257fde29c7a]
   365   |      semi-colon: 2:337fec4d2edc 3:f257fde29c7a
   368   |      semi-colon: [337fec4d2edc, f257fde29c7a]
   366   |      Fate: split as 337fec4d2edc, f257fde29c7a
   369   |      Fate: split as 337fec4d2edc, f257fde29c7a
   367   |
   370   |
   368   o  ea207398892e
   371   o  ea207398892e
   369   
   372   
   370   $ hg fatelog
   373   $ hg fatelog
   392   
   395   
   393 Precursors template should show the precursor as we force its display with
   396 Precursors template should show the precursor as we force its display with
   394 --hidden
   397 --hidden
   395   $ hg tlog --hidden
   398   $ hg tlog --hidden
   396   @  f257fde29c7a
   399   @  f257fde29c7a
   397   |    Precursors: 1:471597cad322
   400   |    Precursors: 471597cad322
   398   |    semi-colon: 1:471597cad322
   401   |    semi-colon: 471597cad322
   399   o  337fec4d2edc
   402   o  337fec4d2edc
   400   |    Precursors: 1:471597cad322
   403   |    Precursors: 471597cad322
   401   |    semi-colon: 1:471597cad322
   404   |    semi-colon: 471597cad322
   402   | x  471597cad322
   405   | x  471597cad322
   403   |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
   406   |/     Successors: [337fec4d2edc, f257fde29c7a]
   404   |      semi-colon: 2:337fec4d2edc 3:f257fde29c7a
   407   |      semi-colon: [337fec4d2edc, f257fde29c7a]
   405   |      Fate: split as 337fec4d2edc, f257fde29c7a
   408   |      Fate: split as 337fec4d2edc, f257fde29c7a
   406   |
   409   |
   407   o  ea207398892e
   410   o  ea207398892e
   408   
   411   
   409   $ hg fatelog --hidden
   412   $ hg fatelog --hidden
   420   $ hg fatelogjson --hidden
   423   $ hg fatelogjson --hidden
   421   @  f257fde29c7a []
   424   @  f257fde29c7a []
   422   |
   425   |
   423   o  337fec4d2edc []
   426   o  337fec4d2edc []
   424   |
   427   |
   425   | x  471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}]
   428   | x  471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] (glob)
   426   |/
   429   |/
   427   o  ea207398892e []
   430   o  ea207398892e []
   428   
   431   
   429 
   432 
   430 Test templates with folded commit
   433 Test templates with folded commit
   467   |  summary:     C0
   470   |  summary:     C0
   468   |
   471   |
   469   | x  changeset:   2:0dec01379d3b
   472   | x  changeset:   2:0dec01379d3b
   470   | |  user:        test
   473   | |  user:        test
   471   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   474   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   472   | |  obsolete:    rewritten as eb5a0daa2192
       
   473   | |  summary:     B0
   475   | |  summary:     B0
   474   | |
   476   | |
   475   | x  changeset:   1:471f378eab4c
   477   | x  changeset:   1:471f378eab4c
   476   |/   user:        test
   478   |/   user:        test
   477   |    date:        Thu Jan 01 00:00:00 1970 +0000
   479   |    date:        Thu Jan 01 00:00:00 1970 +0000
   478   |    obsolete:    rewritten as eb5a0daa2192
       
   479   |    summary:     A0
   480   |    summary:     A0
   480   |
   481   |
   481   o  changeset:   0:ea207398892e
   482   o  changeset:   0:ea207398892e
   482      user:        test
   483      user:        test
   483      date:        Thu Jan 01 00:00:00 1970 +0000
   484      date:        Thu Jan 01 00:00:00 1970 +0000
   492   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   493   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   493 
   494 
   494 Precursors template should show current revision as it is the working copy
   495 Precursors template should show current revision as it is the working copy
   495   $ hg tlog
   496   $ hg tlog
   496   o  eb5a0daa2192
   497   o  eb5a0daa2192
   497   |    Precursors: 1:471f378eab4c
   498   |    Precursors: 471f378eab4c
   498   |    semi-colon: 1:471f378eab4c
   499   |    semi-colon: 471f378eab4c
   499   | @  471f378eab4c
   500   | @  471f378eab4c
   500   |/     Successors: 3:eb5a0daa2192
   501   |/     Successors: [eb5a0daa2192]
   501   |      semi-colon: 3:eb5a0daa2192
   502   |      semi-colon: [eb5a0daa2192]
   502   |      Fate: rewritten as eb5a0daa2192
   503   |      Fate: rewritten as eb5a0daa2192
   503   |
   504   |
   504   o  ea207398892e
   505   o  ea207398892e
   505   
   506   
   506   $ hg fatelog
   507   $ hg fatelog
   518 
   519 
   519 Precursors template should show both precursors as they should be both
   520 Precursors template should show both precursors as they should be both
   520 displayed
   521 displayed
   521   $ hg tlog
   522   $ hg tlog
   522   o  eb5a0daa2192
   523   o  eb5a0daa2192
   523   |    Precursors: 2:0dec01379d3b 1:471f378eab4c
   524   |    Precursors: 0dec01379d3b 471f378eab4c
   524   |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
   525   |    semi-colon: 0dec01379d3b; 471f378eab4c
   525   | @  0dec01379d3b
   526   | @  0dec01379d3b
   526   | |    Successors: 3:eb5a0daa2192
   527   | |    Successors: [eb5a0daa2192]
   527   | |    semi-colon: 3:eb5a0daa2192
   528   | |    semi-colon: [eb5a0daa2192]
   528   | |    Fate: rewritten as eb5a0daa2192
   529   | |    Fate: rewritten as eb5a0daa2192
   529   | |
   530   | |
   530   | x  471f378eab4c
   531   | x  471f378eab4c
   531   |/     Successors: 3:eb5a0daa2192
   532   |/     Successors: [eb5a0daa2192]
   532   |      semi-colon: 3:eb5a0daa2192
   533   |      semi-colon: [eb5a0daa2192]
   533   |      Fate: rewritten as eb5a0daa2192
   534   |      Fate: rewritten as eb5a0daa2192
   534   |
   535   |
   535   o  ea207398892e
   536   o  ea207398892e
   536   
   537   
   537   $ hg fatelog
   538   $ hg fatelog
   558   
   559   
   559 Precursors template should show both precursors as we force its display with
   560 Precursors template should show both precursors as we force its display with
   560 --hidden
   561 --hidden
   561   $ hg tlog --hidden
   562   $ hg tlog --hidden
   562   @  eb5a0daa2192
   563   @  eb5a0daa2192
   563   |    Precursors: 2:0dec01379d3b 1:471f378eab4c
   564   |    Precursors: 0dec01379d3b 471f378eab4c
   564   |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
   565   |    semi-colon: 0dec01379d3b; 471f378eab4c
   565   | x  0dec01379d3b
   566   | x  0dec01379d3b
   566   | |    Successors: 3:eb5a0daa2192
   567   | |    Successors: [eb5a0daa2192]
   567   | |    semi-colon: 3:eb5a0daa2192
   568   | |    semi-colon: [eb5a0daa2192]
   568   | |    Fate: rewritten as eb5a0daa2192
   569   | |    Fate: rewritten as eb5a0daa2192
   569   | |
   570   | |
   570   | x  471f378eab4c
   571   | x  471f378eab4c
   571   |/     Successors: 3:eb5a0daa2192
   572   |/     Successors: [eb5a0daa2192]
   572   |      semi-colon: 3:eb5a0daa2192
   573   |      semi-colon: [eb5a0daa2192]
   573   |      Fate: rewritten as eb5a0daa2192
   574   |      Fate: rewritten as eb5a0daa2192
   574   |
   575   |
   575   o  ea207398892e
   576   o  ea207398892e
   576   
   577   
   577   $ hg fatelog --hidden
   578   $ hg fatelog --hidden
   587   
   588   
   588 
   589 
   589   $ hg fatelogjson --hidden
   590   $ hg fatelogjson --hidden
   590   @  eb5a0daa2192 []
   591   @  eb5a0daa2192 []
   591   |
   592   |
   592   | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
   593   | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
   593   | |
   594   | |
   594   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
   595   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
   595   |/
   596   |/
   596   o  ea207398892e []
   597   o  ea207398892e []
   597   
   598   
   598 
   599 
   599 Test templates with divergence
   600 Test templates with divergence
   616   |  summary:     A1
   617   |  summary:     A1
   617   |
   618   |
   618   | x  changeset:   1:471f378eab4c
   619   | x  changeset:   1:471f378eab4c
   619   |/   user:        test
   620   |/   user:        test
   620   |    date:        Thu Jan 01 00:00:00 1970 +0000
   621   |    date:        Thu Jan 01 00:00:00 1970 +0000
   621   |    obsolete:    reworded as fdf9bde5129a
       
   622   |    summary:     A0
   622   |    summary:     A0
   623   |
   623   |
   624   o  changeset:   0:ea207398892e
   624   o  changeset:   0:ea207398892e
   625      user:        test
   625      user:        test
   626      date:        Thu Jan 01 00:00:00 1970 +0000
   626      date:        Thu Jan 01 00:00:00 1970 +0000
   649   |    summary:     A1
   649   |    summary:     A1
   650   |
   650   |
   651   | x  changeset:   1:471f378eab4c
   651   | x  changeset:   1:471f378eab4c
   652   |/   user:        test
   652   |/   user:        test
   653   |    date:        Thu Jan 01 00:00:00 1970 +0000
   653   |    date:        Thu Jan 01 00:00:00 1970 +0000
   654   |    obsolete:    reworded as fdf9bde5129a
       
   655   |    obsolete:    reworded as 65b757b745b9
       
   656   |    summary:     A0
   654   |    summary:     A0
   657   |
   655   |
   658   o  changeset:   0:ea207398892e
   656   o  changeset:   0:ea207398892e
   659      user:        test
   657      user:        test
   660      date:        Thu Jan 01 00:00:00 1970 +0000
   658      date:        Thu Jan 01 00:00:00 1970 +0000
   671   (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
   669   (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
   672 
   670 
   673 Precursors template should show current revision as it is the working copy
   671 Precursors template should show current revision as it is the working copy
   674   $ hg tlog
   672   $ hg tlog
   675   o  019fadeab383
   673   o  019fadeab383
   676   |    Precursors: 1:471f378eab4c
   674   |    Precursors: 471f378eab4c
   677   |    semi-colon: 1:471f378eab4c
   675   |    semi-colon: 471f378eab4c
   678   | o  fdf9bde5129a
   676   | o  fdf9bde5129a
   679   |/     Precursors: 1:471f378eab4c
   677   |/     Precursors: 471f378eab4c
   680   |      semi-colon: 1:471f378eab4c
   678   |      semi-colon: 471f378eab4c
   681   | @  471f378eab4c
   679   | @  471f378eab4c
   682   |/     Successors: 2:fdf9bde5129a; 4:019fadeab383
   680   |/     Successors: [fdf9bde5129a], [019fadeab383]
   683   |      semi-colon: 2:fdf9bde5129a; 4:019fadeab383
   681   |      semi-colon: [fdf9bde5129a]; [019fadeab383]
   684   |      Fate: reworded as fdf9bde5129a
   682   |      Fate: reworded as fdf9bde5129a
   685   |      Fate: reworded as 019fadeab383
   683   |      Fate: reworded as 019fadeab383
   686   |
   684   |
   687   o  ea207398892e
   685   o  ea207398892e
   688   
   686   
   717   o  ea207398892e
   715   o  ea207398892e
   718   
   716   
   719 Precursors template should a precursor as we force its display with --hidden
   717 Precursors template should a precursor as we force its display with --hidden
   720   $ hg tlog --hidden
   718   $ hg tlog --hidden
   721   o  019fadeab383
   719   o  019fadeab383
   722   |    Precursors: 3:65b757b745b9
   720   |    Precursors: 65b757b745b9
   723   |    semi-colon: 3:65b757b745b9
   721   |    semi-colon: 65b757b745b9
   724   | x  65b757b745b9
   722   | x  65b757b745b9
   725   |/     Precursors: 1:471f378eab4c
   723   |/     Precursors: 471f378eab4c
   726   |      semi-colon: 1:471f378eab4c
   724   |      semi-colon: 471f378eab4c
   727   |      Successors: 4:019fadeab383
   725   |      Successors: [019fadeab383]
   728   |      semi-colon: 4:019fadeab383
   726   |      semi-colon: [019fadeab383]
   729   |      Fate: reworded as 019fadeab383
   727   |      Fate: reworded as 019fadeab383
   730   |
   728   |
   731   | @  fdf9bde5129a
   729   | @  fdf9bde5129a
   732   |/     Precursors: 1:471f378eab4c
   730   |/     Precursors: 471f378eab4c
   733   |      semi-colon: 1:471f378eab4c
   731   |      semi-colon: 471f378eab4c
   734   | x  471f378eab4c
   732   | x  471f378eab4c
   735   |/     Successors: 2:fdf9bde5129a; 3:65b757b745b9
   733   |/     Successors: [fdf9bde5129a], [65b757b745b9]
   736   |      semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
   734   |      semi-colon: [fdf9bde5129a]; [65b757b745b9]
   737   |      Fate: reworded as fdf9bde5129a
   735   |      Fate: reworded as fdf9bde5129a
   738   |      Fate: reworded as 65b757b745b9
   736   |      Fate: reworded as 65b757b745b9
   739   |
   737   |
   740   o  ea207398892e
   738   o  ea207398892e
   741   
   739   
   754   
   752   
   755 
   753 
   756   $ hg fatelogjson --hidden
   754   $ hg fatelogjson --hidden
   757   o  019fadeab383 []
   755   o  019fadeab383 []
   758   |
   756   |
   759   | x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
   757   | x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] (glob)
   760   |/
   758   |/
   761   | @  fdf9bde5129a []
   759   | @  fdf9bde5129a []
   762   |/
   760   |/
   763   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}]
   761   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] (glob)
   764   |/
   762   |/
   765   o  ea207398892e []
   763   o  ea207398892e []
   766   
   764   
   767 
   765 
   768 Test templates with amended + folded commit
   766 Test templates with amended + folded commit
   786   |  summary:     B1
   784   |  summary:     B1
   787   |
   785   |
   788   | x  changeset:   2:0dec01379d3b
   786   | x  changeset:   2:0dec01379d3b
   789   |/   user:        test
   787   |/   user:        test
   790   |    date:        Thu Jan 01 00:00:00 1970 +0000
   788   |    date:        Thu Jan 01 00:00:00 1970 +0000
   791   |    obsolete:    reworded as b7ea6d14e664
       
   792   |    summary:     B0
   789   |    summary:     B0
   793   |
   790   |
   794   o  changeset:   1:471f378eab4c
   791   o  changeset:   1:471f378eab4c
   795   |  user:        test
   792   |  user:        test
   796   |  date:        Thu Jan 01 00:00:00 1970 +0000
   793   |  date:        Thu Jan 01 00:00:00 1970 +0000
   814   |
   811   |
   815   | x  changeset:   3:b7ea6d14e664
   812   | x  changeset:   3:b7ea6d14e664
   816   | |  parent:      1:471f378eab4c
   813   | |  parent:      1:471f378eab4c
   817   | |  user:        test
   814   | |  user:        test
   818   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   815   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   819   | |  obsolete:    rewritten as eb5a0daa2192
       
   820   | |  summary:     B1
   816   | |  summary:     B1
   821   | |
   817   | |
   822   | | x  changeset:   2:0dec01379d3b
   818   | | x  changeset:   2:0dec01379d3b
   823   | |/   user:        test
   819   | |/   user:        test
   824   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   820   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   825   | |    obsolete:    reworded as b7ea6d14e664
       
   826   | |    summary:     B0
   821   | |    summary:     B0
   827   | |
   822   | |
   828   | x  changeset:   1:471f378eab4c
   823   | x  changeset:   1:471f378eab4c
   829   |/   user:        test
   824   |/   user:        test
   830   |    date:        Thu Jan 01 00:00:00 1970 +0000
   825   |    date:        Thu Jan 01 00:00:00 1970 +0000
   831   |    obsolete:    rewritten as eb5a0daa2192
       
   832   |    summary:     A0
   826   |    summary:     A0
   833   |
   827   |
   834   o  changeset:   0:ea207398892e
   828   o  changeset:   0:ea207398892e
   835      user:        test
   829      user:        test
   836      date:        Thu Jan 01 00:00:00 1970 +0000
   830      date:        Thu Jan 01 00:00:00 1970 +0000
   843   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   837   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   844   working directory parent is obsolete! (471f378eab4c)
   838   working directory parent is obsolete! (471f378eab4c)
   845   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   839   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   846   $ hg tlog
   840   $ hg tlog
   847   o  eb5a0daa2192
   841   o  eb5a0daa2192
   848   |    Precursors: 1:471f378eab4c
   842   |    Precursors: 471f378eab4c
   849   |    semi-colon: 1:471f378eab4c
   843   |    semi-colon: 471f378eab4c
   850   | @  471f378eab4c
   844   | @  471f378eab4c
   851   |/     Successors: 4:eb5a0daa2192
   845   |/     Successors: [eb5a0daa2192]
   852   |      semi-colon: 4:eb5a0daa2192
   846   |      semi-colon: [eb5a0daa2192]
   853   |      Fate: rewritten as eb5a0daa2192
   847   |      Fate: rewritten as eb5a0daa2192
   854   |
   848   |
   855   o  ea207398892e
   849   o  ea207398892e
   856   
   850   
   857   $ hg fatelog
   851   $ hg fatelog
   866   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   860   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   867   working directory parent is obsolete! (0dec01379d3b)
   861   working directory parent is obsolete! (0dec01379d3b)
   868   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   862   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   869   $ hg tlog
   863   $ hg tlog
   870   o  eb5a0daa2192
   864   o  eb5a0daa2192
   871   |    Precursors: 2:0dec01379d3b 1:471f378eab4c
   865   |    Precursors: 0dec01379d3b 471f378eab4c
   872   |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
   866   |    semi-colon: 0dec01379d3b; 471f378eab4c
   873   | @  0dec01379d3b
   867   | @  0dec01379d3b
   874   | |    Successors: 4:eb5a0daa2192
   868   | |    Successors: [eb5a0daa2192]
   875   | |    semi-colon: 4:eb5a0daa2192
   869   | |    semi-colon: [eb5a0daa2192]
   876   | |    Fate: rewritten as eb5a0daa2192
   870   | |    Fate: rewritten as eb5a0daa2192
   877   | |
   871   | |
   878   | x  471f378eab4c
   872   | x  471f378eab4c
   879   |/     Successors: 4:eb5a0daa2192
   873   |/     Successors: [eb5a0daa2192]
   880   |      semi-colon: 4:eb5a0daa2192
   874   |      semi-colon: [eb5a0daa2192]
   881   |      Fate: rewritten as eb5a0daa2192
   875   |      Fate: rewritten as eb5a0daa2192
   882   |
   876   |
   883   o  ea207398892e
   877   o  ea207398892e
   884   
   878   
   885   $ hg fatelog
   879   $ hg fatelog
   898   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   892   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   899   working directory parent is obsolete! (b7ea6d14e664)
   893   working directory parent is obsolete! (b7ea6d14e664)
   900   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   894   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   901   $ hg tlog
   895   $ hg tlog
   902   o  eb5a0daa2192
   896   o  eb5a0daa2192
   903   |    Precursors: 1:471f378eab4c 3:b7ea6d14e664
   897   |    Precursors: 471f378eab4c b7ea6d14e664
   904   |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
   898   |    semi-colon: 471f378eab4c; b7ea6d14e664
   905   | @  b7ea6d14e664
   899   | @  b7ea6d14e664
   906   | |    Successors: 4:eb5a0daa2192
   900   | |    Successors: [eb5a0daa2192]
   907   | |    semi-colon: 4:eb5a0daa2192
   901   | |    semi-colon: [eb5a0daa2192]
   908   | |    Fate: rewritten as eb5a0daa2192
   902   | |    Fate: rewritten as eb5a0daa2192
   909   | |
   903   | |
   910   | x  471f378eab4c
   904   | x  471f378eab4c
   911   |/     Successors: 4:eb5a0daa2192
   905   |/     Successors: [eb5a0daa2192]
   912   |      semi-colon: 4:eb5a0daa2192
   906   |      semi-colon: [eb5a0daa2192]
   913   |      Fate: rewritten as eb5a0daa2192
   907   |      Fate: rewritten as eb5a0daa2192
   914   |
   908   |
   915   o  ea207398892e
   909   o  ea207398892e
   916   
   910   
   917   $ hg fatelog
   911   $ hg fatelog
   933   |
   927   |
   934   o  ea207398892e
   928   o  ea207398892e
   935   
   929   
   936   $ hg tlog --hidden
   930   $ hg tlog --hidden
   937   @  eb5a0daa2192
   931   @  eb5a0daa2192
   938   |    Precursors: 1:471f378eab4c 3:b7ea6d14e664
   932   |    Precursors: 471f378eab4c b7ea6d14e664
   939   |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
   933   |    semi-colon: 471f378eab4c; b7ea6d14e664
   940   | x  b7ea6d14e664
   934   | x  b7ea6d14e664
   941   | |    Precursors: 2:0dec01379d3b
   935   | |    Precursors: 0dec01379d3b
   942   | |    semi-colon: 2:0dec01379d3b
   936   | |    semi-colon: 0dec01379d3b
   943   | |    Successors: 4:eb5a0daa2192
   937   | |    Successors: [eb5a0daa2192]
   944   | |    semi-colon: 4:eb5a0daa2192
   938   | |    semi-colon: [eb5a0daa2192]
   945   | |    Fate: rewritten as eb5a0daa2192
   939   | |    Fate: rewritten as eb5a0daa2192
   946   | |
   940   | |
   947   | | x  0dec01379d3b
   941   | | x  0dec01379d3b
   948   | |/     Successors: 3:b7ea6d14e664
   942   | |/     Successors: [b7ea6d14e664]
   949   | |      semi-colon: 3:b7ea6d14e664
   943   | |      semi-colon: [b7ea6d14e664]
   950   | |      Fate: reworded as b7ea6d14e664
   944   | |      Fate: reworded as b7ea6d14e664
   951   | |
   945   | |
   952   | x  471f378eab4c
   946   | x  471f378eab4c
   953   |/     Successors: 4:eb5a0daa2192
   947   |/     Successors: [eb5a0daa2192]
   954   |      semi-colon: 4:eb5a0daa2192
   948   |      semi-colon: [eb5a0daa2192]
   955   |      Fate: rewritten as eb5a0daa2192
   949   |      Fate: rewritten as eb5a0daa2192
   956   |
   950   |
   957   o  ea207398892e
   951   o  ea207398892e
   958   
   952   
   959   $ hg fatelog --hidden
   953   $ hg fatelog --hidden
   971   o  ea207398892e
   965   o  ea207398892e
   972   
   966   
   973   $ hg fatelogjson --hidden
   967   $ hg fatelogjson --hidden
   974   @  eb5a0daa2192 []
   968   @  eb5a0daa2192 []
   975   |
   969   |
   976   | x  b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
   970   | x  b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
   977   | |
   971   | |
   978   | | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}]
   972   | | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] (glob)
   979   | |/
   973   | |/
   980   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
   974   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
   981   |/
   975   |/
   982   o  ea207398892e []
   976   o  ea207398892e []
   983   
   977   
   984 
   978 
   985 Test template with pushed and pulled obs markers
   979 Test template with pushed and pulled obs markers
  1021   |
  1015   |
  1022   | x  changeset:   2:fdf9bde5129a
  1016   | x  changeset:   2:fdf9bde5129a
  1023   |/   parent:      0:ea207398892e
  1017   |/   parent:      0:ea207398892e
  1024   |    user:        test
  1018   |    user:        test
  1025   |    date:        Thu Jan 01 00:00:00 1970 +0000
  1019   |    date:        Thu Jan 01 00:00:00 1970 +0000
  1026   |    obsolete:    reworded as 7a230b46bf61
       
  1027   |    summary:     A1
  1020   |    summary:     A1
  1028   |
  1021   |
  1029   | x  changeset:   1:471f378eab4c
  1022   | x  changeset:   1:471f378eab4c
  1030   |/   user:        test
  1023   |/   user:        test
  1031   |    date:        Thu Jan 01 00:00:00 1970 +0000
  1024   |    date:        Thu Jan 01 00:00:00 1970 +0000
  1032   |    obsolete:    reworded as fdf9bde5129a
       
  1033   |    summary:     A0
  1025   |    summary:     A0
  1034   |
  1026   |
  1035   o  changeset:   0:ea207398892e
  1027   o  changeset:   0:ea207398892e
  1036      user:        test
  1028      user:        test
  1037      date:        Thu Jan 01 00:00:00 1970 +0000
  1029      date:        Thu Jan 01 00:00:00 1970 +0000
  1044   adding changesets
  1036   adding changesets
  1045   adding manifests
  1037   adding manifests
  1046   adding file changes
  1038   adding file changes
  1047   added 1 changesets with 0 changes to 1 files (+1 heads)
  1039   added 1 changesets with 0 changes to 1 files (+1 heads)
  1048   2 new obsolescence markers
  1040   2 new obsolescence markers
  1049   obsoleted 1 changesets
       
  1050   (run 'hg heads' to see heads, 'hg merge' to merge)
  1041   (run 'hg heads' to see heads, 'hg merge' to merge)
  1051   working directory parent is obsolete! (471f378eab4c)
  1042   working directory parent is obsolete! (471f378eab4c)
  1052   (use 'hg evolve' to update to its successor: 7a230b46bf61)
  1043   (use 'hg evolve' to update to its successor: 7a230b46bf61)
  1053   $ hg log --hidden -G
  1044   $ hg log --hidden -G
  1054   o  changeset:   2:7a230b46bf61
  1045   o  changeset:   2:7a230b46bf61
  1059   |  summary:     A2
  1050   |  summary:     A2
  1060   |
  1051   |
  1061   | @  changeset:   1:471f378eab4c
  1052   | @  changeset:   1:471f378eab4c
  1062   |/   user:        test
  1053   |/   user:        test
  1063   |    date:        Thu Jan 01 00:00:00 1970 +0000
  1054   |    date:        Thu Jan 01 00:00:00 1970 +0000
  1064   |    obsolete:    reworded as 7a230b46bf61
       
  1065   |    summary:     A0
  1055   |    summary:     A0
  1066   |
  1056   |
  1067   o  changeset:   0:ea207398892e
  1057   o  changeset:   0:ea207398892e
  1068      user:        test
  1058      user:        test
  1069      date:        Thu Jan 01 00:00:00 1970 +0000
  1059      date:        Thu Jan 01 00:00:00 1970 +0000
  1072 Check templates
  1062 Check templates
  1073 ---------------
  1063 ---------------
  1074 
  1064 
  1075   $ hg tlog
  1065   $ hg tlog
  1076   o  7a230b46bf61
  1066   o  7a230b46bf61
  1077   |    Precursors: 1:471f378eab4c
  1067   |    Precursors: 471f378eab4c
  1078   |    semi-colon: 1:471f378eab4c
  1068   |    semi-colon: 471f378eab4c
  1079   | @  471f378eab4c
  1069   | @  471f378eab4c
  1080   |/     Successors: 2:7a230b46bf61
  1070   |/     Successors: [7a230b46bf61]
  1081   |      semi-colon: 2:7a230b46bf61
  1071   |      semi-colon: [7a230b46bf61]
  1082   |      Fate: reworded as 7a230b46bf61
  1072   |      Fate: reworded as 7a230b46bf61
  1083   |
  1073   |
  1084   o  ea207398892e
  1074   o  ea207398892e
  1085   
  1075   
  1086   $ hg fatelog --hidden -v
  1076   $ hg fatelog --hidden -v
  1087   o  7a230b46bf61
  1077   o  7a230b46bf61
  1088   |
  1078   |
  1089   | @  471f378eab4c
  1079   | @  471f378eab4c
  1090   |/     Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
  1080   |/     Obsfate: reworded as 7a230b46bf61 by test (*) (glob)
  1091   |
  1081   |
  1092   o  ea207398892e
  1082   o  ea207398892e
  1093   
  1083   
  1094   $ hg up 'desc(A2)'
  1084   $ hg up 'desc(A2)'
  1095   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1085   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1103   |
  1093   |
  1104   o  ea207398892e
  1094   o  ea207398892e
  1105   
  1095   
  1106   $ hg tlog --hidden
  1096   $ hg tlog --hidden
  1107   @  7a230b46bf61
  1097   @  7a230b46bf61
  1108   |    Precursors: 1:471f378eab4c
  1098   |    Precursors: 471f378eab4c
  1109   |    semi-colon: 1:471f378eab4c
  1099   |    semi-colon: 471f378eab4c
  1110   | x  471f378eab4c
  1100   | x  471f378eab4c
  1111   |/     Successors: 2:7a230b46bf61
  1101   |/     Successors: [7a230b46bf61]
  1112   |      semi-colon: 2:7a230b46bf61
  1102   |      semi-colon: [7a230b46bf61]
  1113   |      Fate: reworded as 7a230b46bf61
  1103   |      Fate: reworded as 7a230b46bf61
  1114   |
  1104   |
  1115   o  ea207398892e
  1105   o  ea207398892e
  1116   
  1106   
  1117   $ hg fatelog --hidden -v
  1107   $ hg fatelog --hidden -v
  1118   @  7a230b46bf61
  1108   @  7a230b46bf61
  1119   |
  1109   |
  1120   | x  471f378eab4c
  1110   | x  471f378eab4c
  1121   |/     Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
  1111   |/     Obsfate: reworded as 7a230b46bf61 by test (*) (glob)
  1122   |
  1112   |
  1123   o  ea207398892e
  1113   o  ea207398892e
  1124   
  1114   
  1125 
  1115 
  1126   $ hg fatelogjson --hidden
  1116   $ hg fatelogjson --hidden
  1127   @  7a230b46bf61 []
  1117   @  7a230b46bf61 []
  1128   |
  1118   |
  1129   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}]
  1119   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] (glob)
  1130   |/
  1120   |/
  1131   o  ea207398892e []
  1121   o  ea207398892e []
  1132   
  1122   
  1133 
  1123 
  1134 Test templates with pruned commits
  1124 Test templates with pruned commits
  1159   |
  1149   |
  1160   o  ea207398892e
  1150   o  ea207398892e
  1161   
  1151   
  1162   $ hg fatelog -v
  1152   $ hg fatelog -v
  1163   @  471f378eab4c
  1153   @  471f378eab4c
  1164   |    Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
  1154   |    Obsfate: pruned by test (at *) (glob)
  1165   |
  1155   |
  1166   o  ea207398892e
  1156   o  ea207398892e
  1167   
  1157