Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-obshistory.t
branchmercurial-4.3
changeset 3715 a77fb9669e99
parent 3714 19ec729f3ca2
parent 3591 98941c28f3e2
child 3716 e5ba6531503e
equal deleted inserted replaced
3714:19ec729f3ca2 3715:a77fb9669e99 
    29   $ echo 42 >> A0
 
    29   $ echo 42 >> A0
 
    30   $ hg amend -m "A1
 
    30   $ hg amend -m "A1
 
    31   > 
    31   > 
    32   > Better commit message"
 
    32   > Better commit message"
 
    33   $ hg log --hidden -G
 
    33   $ hg log --hidden -G
 
    34   @  changeset:   2:4ae3a4151de9
 
    34   @  changeset:   3:4ae3a4151de9
 
    35   |  tag:         tip
 
    35   |  tag:         tip
 
    36   |  parent:      0:ea207398892e
 
    36   |  parent:      0:ea207398892e
 
    37   |  user:        test
 
    37   |  user:        test
 
    38   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
    38   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
    39   |  summary:     A1
 
    39   |  summary:     A1
 
    40   |
 
    40   |
 
       
    41   | x  changeset:   2:f137d23bb3e1
 
       
    42   | |  user:        test
 
       
    43   | |  date:        Thu Jan 01 00:00:00 1970 +0000
 
       
    44   | |  obsolete:    pruned
 
       
    45   | |  summary:     temporary amend commit for 471f378eab4c
 
       
    46   | |
 
    41   | x  changeset:   1:471f378eab4c
 
    47   | x  changeset:   1:471f378eab4c
 
    42   |/   user:        test
 
    48   |/   user:        test
 
    43   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
    49   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
    44   |    obsolete:    rewritten using amend as 2:4ae3a4151de9
 
    50   |    obsolete:    rewritten as 4ae3a4151de9
 
    45   |    summary:     A0
 
    51   |    summary:     A0
 
    46   |
 
    52   |
 
    47   o  changeset:   0:ea207398892e
 
    53   o  changeset:   0:ea207398892e
 
    48      user:        test
 
    54      user:        test
 
    49      date:        Thu Jan 01 00:00:00 1970 +0000
 
    55      date:        Thu Jan 01 00:00:00 1970 +0000
 
    50      summary:     ROOT
 
    56      summary:     ROOT
 
    51   
    57   
    52 Actual test
 
    58 Actual test
 
    53 -----------
 
    59 -----------
 
    54   $ hg obslog --patch 4ae3a4151de9
 
    60   $ hg obslog --patch 4ae3a4151de9
 
    55   @  4ae3a4151de9 (2) A1
 
    61   @  4ae3a4151de9 (3) A1
 
    56   |
 
    62   |
 
    57   x  471f378eab4c (1) A0
 
    63   x  471f378eab4c (1) A0
 
    58        rewritten(description, content) as 4ae3a4151de9 using amend by test (*) (glob)
 
    64        rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
    59          diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
    65          diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
    60          --- a/changeset-description
 
    66          --- a/changeset-description
 
    61          +++ b/changeset-description
 
    67          +++ b/changeset-description
 
    62          @@ -1,1 +1,3 @@
 
    68          @@ -1,1 +1,3 @@
 
    63          -A0
 
    69          -A0
 
    72           A0
 
    78           A0
 
    73          +42
 
    79          +42
 
    74   
    80   
    75   
    81   
    76   $ hg obslog --patch --color debug
 
    82   $ hg obslog --patch --color debug
 
    77   @  [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1]
 
    83   @  [evolve.node|4ae3a4151de9] [evolve.rev|(3)] [evolve.short_description|A1]
 
    78   |
 
    84   |
 
    79   x  [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
 
    85   x  [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
 
    80        [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
 
    86        [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
 
    81          [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
 
    87          [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
 
    82          [diff.file_a|--- a/changeset-description]
 
    88          [diff.file_a|--- a/changeset-description]
 
    83          [diff.file_b|+++ b/changeset-description]
 
    89          [diff.file_b|+++ b/changeset-description]
 
    84          [diff.hunk|@@ -1,1 +1,3 @@]
 
    90          [diff.hunk|@@ -1,1 +1,3 @@]
 
    85          [diff.deleted|-A0]
 
    91          [diff.deleted|-A0]
 
    95          [diff.inserted|+42]
 
   101          [diff.inserted|+42]
 
    96   
   102   
    97   
   103   
    98 
   104 
    99   $ hg obslog --no-graph --patch 4ae3a4151de9
 
   105   $ hg obslog --no-graph --patch 4ae3a4151de9
 
   100   4ae3a4151de9 (2) A1
 
   106   4ae3a4151de9 (3) A1
 
   101   471f378eab4c (1) A0
 
   107   471f378eab4c (1) A0
 
   102     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   108     rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   103       diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
   109       diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
   104       --- a/changeset-description
 
   110       --- a/changeset-description
 
   105       +++ b/changeset-description
 
   111       +++ b/changeset-description
 
   106       @@ -1,1 +1,3 @@
 
   112       @@ -1,1 +1,3 @@
 
   107       -A0
 
   113       -A0
 
   125   $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
 
   131   $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
 
   126   [
 
   132   [
 
   127       {
 
   133       {
 
   128           "markers": [],
 
   134           "markers": [],
 
   129           "node": "4ae3a4151de9",
 
   135           "node": "4ae3a4151de9",
 
   130           "rev": 2,
 
   136           "rev": 3,
 
   131           "shortdescription": "A1"
 
   137           "shortdescription": "A1"
 
   132       },
 
   138       },
 
   133       {
 
   139       {
 
   134           "markers": [
 
   140           "markers": [
 
   135               {
 
   141               {
 
   139                   ],
 
   145                   ],
 
   140                   "effect": [
 
   146                   "effect": [
 
   141                       "description",
 
   147                       "description",
 
   142                       "content"
 
   148                       "content"
 
   143                   ],
 
   149                   ],
 
   144                   "operation": "amend",
 
       
   145                   "succnodes": [
 
   150                   "succnodes": [
 
   146                       "4ae3a4151de9"
 
   151                       "4ae3a4151de9"
 
   147                   ],
 
   152                   ],
 
   148                   "user": "test",
 
   153                   "user": "test",
 
   149                   "verb": "rewritten"
 
   154                   "verb": "rewritten"
 
   154           "shortdescription": "A0"
 
   159           "shortdescription": "A0"
 
   155       }
 
   160       }
 
   156   ]
 
   161   ]
 
   157   $ hg obslog --hidden --patch 471f378eab4c
 
   162   $ hg obslog --hidden --patch 471f378eab4c
 
   158   x  471f378eab4c (1) A0
 
   163   x  471f378eab4c (1) A0
 
   159        rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   164        rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   160          diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
   165          diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
   161          --- a/changeset-description
 
   166          --- a/changeset-description
 
   162          +++ b/changeset-description
 
   167          +++ b/changeset-description
 
   163          @@ -1,1 +1,3 @@
 
   168          @@ -1,1 +1,3 @@
 
   164          -A0
 
   169          -A0
 
   185                   ],
 
   190                   ],
 
   186                   "effect": [
 
   191                   "effect": [
 
   187                       *, (glob)
 
   192                       *, (glob)
 
   188                       "content"
 
   193                       "content"
 
   189                   ],
 
   194                   ],
 
   190                   "operation": "amend",
 
       
   191                   "succnodes": [
 
   195                   "succnodes": [
 
   192                       "4ae3a4151de9"
 
   196                       "4ae3a4151de9"
 
   193                   ],
 
   197                   ],
 
   194                   "user": "test",
 
   198                   "user": "test",
 
   195                   "verb": "rewritten"
 
   199                   "verb": "rewritten"
 
   244   $ hg log --hidden -G
 
   248   $ hg log --hidden -G
 
   245   x  changeset:   2:0dec01379d3b
 
   249   x  changeset:   2:0dec01379d3b
 
   246   |  tag:         tip
 
   250   |  tag:         tip
 
   247   |  user:        test
 
   251   |  user:        test
 
   248   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   252   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   249   |  obsolete:    pruned using prune
 
   253   |  obsolete:    pruned
 
   250   |  summary:     B0
 
   254   |  summary:     B0
 
   251   |
 
   255   |
 
   252   @  changeset:   1:471f378eab4c
 
   256   @  changeset:   1:471f378eab4c
 
   253   |  user:        test
 
   257   |  user:        test
 
   254   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   258   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   263 Actual test
 
   267 Actual test
 
   264 -----------
 
   268 -----------
 
   265 
   269 
   266   $ hg obslog 'desc(B0)' --hidden --patch
 
   270   $ hg obslog 'desc(B0)' --hidden --patch
 
   267   x  0dec01379d3b (2) B0
 
   271   x  0dec01379d3b (2) B0
 
   268        pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   272        pruned by test (Thu Jan 01 00:00:00 1970 +0000)
 
   269          (No patch available, no successors)
 
   273          (No patch available, no successors)
 
   270   
   274   
   271   $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool
 
   275   $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool
 
   272   [
 
   276   [
 
   273       {
 
   277       {
 
   275               {
 
   279               {
 
   276                   "date": [
 
   280                   "date": [
 
   277                       *, (glob)
 
   281                       *, (glob)
 
   278                       0 (glob)
 
   282                       0 (glob)
 
   279                   ],
 
   283                   ],
 
   280                   "operation": "prune",
 
       
   281                   "user": "test",
 
   284                   "user": "test",
 
   282                   "verb": "pruned"
 
   285                   "verb": "pruned"
 
   283               }
 
   286               }
 
   284           ],
 
   287           ],
 
   285           "node": "0dec01379d3b",
 
   288           "node": "0dec01379d3b",
 
   342   > n
 
   345   > n
 
   343   > n
 
   346   > n
 
   344   > y
 
   347   > y
 
   345   > y
 
   348   > y
 
   346   > EOF
 
   349   > EOF
 
       
   350   current hg version does not support storing note in obsmarker
 
   347   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   351   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   348   adding a
 
   352   adding a
 
   349   adding b
 
   353   adding b
 
   350   diff --git a/a b/a
 
   354   diff --git a/a b/a
 
   351   new file mode 100644
 
   355   new file mode 100644
 
   385   |  summary:     A0
 
   389   |  summary:     A0
 
   386   |
 
   390   |
 
   387   | x  changeset:   1:471597cad322
 
   391   | x  changeset:   1:471597cad322
 
   388   |/   user:        test
 
   392   |/   user:        test
 
   389   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   393   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   390   |    obsolete:    split using split as 2:337fec4d2edc, 3:f257fde29c7a
 
   394   |    obsolete:    split as 337fec4d2edc, f257fde29c7a
 
   391   |    summary:     A0
 
   395   |    summary:     A0
 
   392   |
 
   396   |
 
   393   o  changeset:   0:ea207398892e
 
   397   o  changeset:   0:ea207398892e
 
   394      user:        test
 
   398      user:        test
 
   395      date:        Thu Jan 01 00:00:00 1970 +0000
 
   399      date:        Thu Jan 01 00:00:00 1970 +0000
 
   399 -----------
 
   403 -----------
 
   400 
   404 
   401 Check that debugobshistory on splitted commit show both targets
 
   405 Check that debugobshistory on splitted commit show both targets
 
   402   $ hg obslog 471597cad322 --hidden --patch
 
   406   $ hg obslog 471597cad322 --hidden --patch
 
   403   x  471597cad322 (1) A0
 
   407   x  471597cad322 (1) A0
 
   404        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   408        rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   405          note: testing split
 
   409          note: testing split
 
   406          (No patch available, too many successors (2))
 
   410          (No patch available, too many successors (2))
 
   407   
   411   
   408   $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
 
   412   $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
 
   409   [
 
   413   [
 
   412               {
 
   416               {
 
   413                   "date": [
 
   417                   "date": [
 
   414                       *, (glob)
 
   418                       *, (glob)
 
   415                       0 (glob)
 
   419                       0 (glob)
 
   416                   ],
 
   420                   ],
 
   417                   "effect": [
 
       
   418                       "parent",
 
       
   419                       "content"
 
       
   420                   ],
 
       
   421                   "note": "testing split",
 
   421                   "note": "testing split",
 
   422                   "operation": "split",
 
       
   423                   "succnodes": [
 
   422                   "succnodes": [
 
   424                       "337fec4d2edc",
 
   423                       "337fec4d2edc",
 
   425                       "f257fde29c7a"
 
   424                       "f257fde29c7a"
 
   426                   ],
 
   425                   ],
 
   427                   "user": "test",
 
   426                   "user": "test",
 
   437 the revision plus the splitted one
 
   436 the revision plus the splitted one
 
   438   $ hg obslog 337fec4d2edc --patch
 
   437   $ hg obslog 337fec4d2edc --patch
 
   439   o  337fec4d2edc (2) A0
 
   438   o  337fec4d2edc (2) A0
 
   440   |
 
   439   |
 
   441   x  471597cad322 (1) A0
 
   440   x  471597cad322 (1) A0
 
   442        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   441        rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   443          note: testing split
 
   442          note: testing split
 
   444          (No patch available, too many successors (2))
 
   443          (No patch available, too many successors (2))
 
   445   
   444   
   446 With the all option, it should show the three changesets
 
   445 With the all option, it should show the three changesets
 
   447   $ hg obslog --all 337fec4d2edc --patch
 
   446   $ hg obslog --all 337fec4d2edc --patch
 
   448   o  337fec4d2edc (2) A0
 
   447   o  337fec4d2edc (2) A0
 
   449   |
 
   448   |
 
   450   | @  f257fde29c7a (3) A0
 
   449   | @  f257fde29c7a (3) A0
 
   451   |/
 
   450   |/
 
   452   x  471597cad322 (1) A0
 
   451   x  471597cad322 (1) A0
 
   453        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   452        rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   454          note: testing split
 
   453          note: testing split
 
   455          (No patch available, too many successors (2))
 
   454          (No patch available, too many successors (2))
 
   456   
   455   
   457 Check that debugobshistory on the second successor after split show
 
   456 Check that debugobshistory on the second successor after split show
 
   458 the revision plus the splitted one
 
   457 the revision plus the splitted one
 
   459   $ hg obslog f257fde29c7a --patch
 
   458   $ hg obslog f257fde29c7a --patch
 
   460   @  f257fde29c7a (3) A0
 
   459   @  f257fde29c7a (3) A0
 
   461   |
 
   460   |
 
   462   x  471597cad322 (1) A0
 
   461   x  471597cad322 (1) A0
 
   463        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   462        rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   464          note: testing split
 
   463          note: testing split
 
   465          (No patch available, too many successors (2))
 
   464          (No patch available, too many successors (2))
 
   466   
   465   
   467 With the all option, it should show the three changesets
 
   466 With the all option, it should show the three changesets
 
   468   $ hg obslog f257fde29c7a --all --patch
 
   467   $ hg obslog f257fde29c7a --all --patch
 
   469   o  337fec4d2edc (2) A0
 
   468   o  337fec4d2edc (2) A0
 
   470   |
 
   469   |
 
   471   | @  f257fde29c7a (3) A0
 
   470   | @  f257fde29c7a (3) A0
 
   472   |/
 
   471   |/
 
   473   x  471597cad322 (1) A0
 
   472   x  471597cad322 (1) A0
 
   474        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   473        rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   475          note: testing split
 
   474          note: testing split
 
   476          (No patch available, too many successors (2))
 
   475          (No patch available, too many successors (2))
 
   477   
   476   
   478 Obslog with all option all should also works on the splitted commit
 
   477 Obslog with all option all should also works on the splitted commit
 
   479   $ hg obslog -a 471597cad322 --hidden --patch
 
   478   $ hg obslog -a 471597cad322 --hidden --patch
 
   480   o  337fec4d2edc (2) A0
 
   479   o  337fec4d2edc (2) A0
 
   481   |
 
   480   |
 
   482   | @  f257fde29c7a (3) A0
 
   481   | @  f257fde29c7a (3) A0
 
   483   |/
 
   482   |/
 
   484   x  471597cad322 (1) A0
 
   483   x  471597cad322 (1) A0
 
   485        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   484        rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   486          note: testing split
 
   485          note: testing split
 
   487          (No patch available, too many successors (2))
 
   486          (No patch available, too many successors (2))
 
   488   
   487   
   489 Check that debugobshistory on both successors after split show
 
   488 Check that debugobshistory on both successors after split show
 
   490 a coherent graph
 
   489 a coherent graph
 
   492   o  337fec4d2edc (2) A0
 
   491   o  337fec4d2edc (2) A0
 
   493   |
 
   492   |
 
   494   | @  f257fde29c7a (3) A0
 
   493   | @  f257fde29c7a (3) A0
 
   495   |/
 
   494   |/
 
   496   x  471597cad322 (1) A0
 
   495   x  471597cad322 (1) A0
 
   497        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   496        rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   498          note: testing split
 
   497          note: testing split
 
   499          (No patch available, too many successors (2))
 
   498          (No patch available, too many successors (2))
 
   500   
   499   
   501   $ hg update 471597cad322
 
   500   $ hg update 471597cad322
 
   502   abort: hidden revision '471597cad322'!
 
   501   abort: hidden revision '471597cad322'!
 
   648   |  summary:     A0
 
   647   |  summary:     A0
 
   649   |
 
   648   |
 
   650   | x  changeset:   1:de7290d8b885
 
   649   | x  changeset:   1:de7290d8b885
 
   651   |/   user:        test
 
   650   |/   user:        test
 
   652   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   651   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   653   |    obsolete:    split using split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b
 
   652   |    obsolete:    split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a
 
   654   |    summary:     A0
 
   653   |    summary:     A0
 
   655   |
 
   654   |
 
   656   o  changeset:   0:ea207398892e
 
   655   o  changeset:   0:ea207398892e
 
   657      user:        test
 
   656      user:        test
 
   658      date:        Thu Jan 01 00:00:00 1970 +0000
 
   657      date:        Thu Jan 01 00:00:00 1970 +0000
 
   661 Actual test
 
   660 Actual test
 
   662 -----------
 
   661 -----------
 
   663 
   662 
   664   $ hg obslog de7290d8b885 --hidden --patch
 
   663   $ hg obslog de7290d8b885 --hidden --patch
 
   665   x  de7290d8b885 (1) A0
 
   664   x  de7290d8b885 (1) A0
 
   666        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   665        rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   667          (No patch available, too many successors (4))
 
   666          (No patch available, too many successors (4))
 
   668   
   667   
   669   $ hg obslog de7290d8b885 --hidden --all --patch
 
   668   $ hg obslog de7290d8b885 --hidden --all --patch
 
   670   o  1ae8bc733a14 (4) A0
 
   669   o  1ae8bc733a14 (4) A0
 
   671   |
 
   670   |
 
   674   | @  c7f044602e9b (5) A0
 
   673   | @  c7f044602e9b (5) A0
 
   675   |/
 
   674   |/
 
   676   | o  f257fde29c7a (3) A0
 
   675   | o  f257fde29c7a (3) A0
 
   677   |/
 
   676   |/
 
   678   x  de7290d8b885 (1) A0
 
   677   x  de7290d8b885 (1) A0
 
   679        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   678        rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   680          (No patch available, too many successors (4))
 
   679          (No patch available, too many successors (4))
 
   681   
   680   
   682   $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
 
   681   $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
 
   683   [
 
   682   [
 
   684       {
 
   683       {
 
   686               {
 
   685               {
 
   687                   "date": [
 
   686                   "date": [
 
   688                       *, (glob)
 
   687                       *, (glob)
 
   689                       0 (glob)
 
   688                       0 (glob)
 
   690                   ],
 
   689                   ],
 
   691                   "effect": [
 
       
   692                       "parent",
 
       
   693                       "content"
 
       
   694                   ],
 
       
   695                   "operation": "split",
 
       
   696                   "succnodes": [
 
   690                   "succnodes": [
 
   697                       "1ae8bc733a14",
 
   691                       "1ae8bc733a14",
 
   698                       "337fec4d2edc",
 
   692                       "337fec4d2edc",
 
   699                       "c7f044602e9b",
 
   693                       "c7f044602e9b",
 
   700                       "f257fde29c7a"
 
   694                       "f257fde29c7a"
 
   710   ]
 
   704   ]
 
   711   $ hg obslog c7f044602e9b --patch
 
   705   $ hg obslog c7f044602e9b --patch
 
   712   @  c7f044602e9b (5) A0
 
   706   @  c7f044602e9b (5) A0
 
   713   |
 
   707   |
 
   714   x  de7290d8b885 (1) A0
 
   708   x  de7290d8b885 (1) A0
 
   715        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   709        rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   716          (No patch available, too many successors (4))
 
   710          (No patch available, too many successors (4))
 
   717   
   711   
   718   $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
 
   712   $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
 
   719   [
 
   713   [
 
   720       {
 
   714       {
 
   728               {
 
   722               {
 
   729                   "date": [
 
   723                   "date": [
 
   730                       *, (glob)
 
   724                       *, (glob)
 
   731                       0 (glob)
 
   725                       0 (glob)
 
   732                   ],
 
   726                   ],
 
   733                   "effect": [
 
       
   734                       "parent",
 
       
   735                       "content"
 
       
   736                   ],
 
       
   737                   "operation": "split",
 
       
   738                   "succnodes": [
 
   727                   "succnodes": [
 
   739                       "1ae8bc733a14",
 
   728                       "1ae8bc733a14",
 
   740                       "337fec4d2edc",
 
   729                       "337fec4d2edc",
 
   741                       "c7f044602e9b",
 
   730                       "c7f044602e9b",
 
   742                       "f257fde29c7a"
 
   731                       "f257fde29c7a"
 
   759   | @  c7f044602e9b (5) A0
 
   748   | @  c7f044602e9b (5) A0
 
   760   |/
 
   749   |/
 
   761   | o  f257fde29c7a (3) A0
 
   750   | o  f257fde29c7a (3) A0
 
   762   |/
 
   751   |/
 
   763   x  de7290d8b885 (1) A0
 
   752   x  de7290d8b885 (1) A0
 
   764        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   753        rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   765          (No patch available, too many successors (4))
 
   754          (No patch available, too many successors (4))
 
   766   
   755   
   767   $ hg obslog 5 --all --patch
 
   756   $ hg obslog 5 --all --patch
 
   768   o  1ae8bc733a14 (4) A0
 
   757   o  1ae8bc733a14 (4) A0
 
   769   |
 
   758   |
 
   772   | @  c7f044602e9b (5) A0
 
   761   | @  c7f044602e9b (5) A0
 
   773   |/
 
   762   |/
 
   774   | o  f257fde29c7a (3) A0
 
   763   | o  f257fde29c7a (3) A0
 
   775   |/
 
   764   |/
 
   776   x  de7290d8b885 (1) A0
 
   765   x  de7290d8b885 (1) A0
 
   777        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   766        rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   778          (No patch available, too many successors (4))
 
   767          (No patch available, too many successors (4))
 
   779   
   768   
   780   $ hg update de7290d8b885
 
   769   $ hg update de7290d8b885
 
   781   abort: hidden revision 'de7290d8b885'!
 
   770   abort: hidden revision 'de7290d8b885'!
 
   782   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
 
   771   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
 
   826   |  summary:     C0
 
   815   |  summary:     C0
 
   827   |
 
   816   |
 
   828   | x  changeset:   2:0dec01379d3b
 
   817   | x  changeset:   2:0dec01379d3b
 
   829   | |  user:        test
 
   818   | |  user:        test
 
   830   | |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   819   | |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   831   | |  obsolete:    rewritten using fold as 3:eb5a0daa2192
 
   820   | |  obsolete:    rewritten as eb5a0daa2192
 
   832   | |  summary:     B0
 
   821   | |  summary:     B0
 
   833   | |
 
   822   | |
 
   834   | x  changeset:   1:471f378eab4c
 
   823   | x  changeset:   1:471f378eab4c
 
   835   |/   user:        test
 
   824   |/   user:        test
 
   836   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   825   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   837   |    obsolete:    rewritten using fold as 3:eb5a0daa2192
 
   826   |    obsolete:    rewritten as eb5a0daa2192
 
   838   |    summary:     A0
 
   827   |    summary:     A0
 
   839   |
 
   828   |
 
   840   o  changeset:   0:ea207398892e
 
   829   o  changeset:   0:ea207398892e
 
   841      user:        test
 
   830      user:        test
 
   842      date:        Thu Jan 01 00:00:00 1970 +0000
 
   831      date:        Thu Jan 01 00:00:00 1970 +0000
 
   847 
   836 
   848 Check that debugobshistory on the first folded revision show only
 
   837 Check that debugobshistory on the first folded revision show only
 
   849 the revision with the target
 
   838 the revision with the target
 
   850   $ hg obslog --hidden 471f378eab4c --patch
 
   839   $ hg obslog --hidden 471f378eab4c --patch
 
   851   x  471f378eab4c (1) A0
 
   840   x  471f378eab4c (1) A0
 
   852        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   841        rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   853          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
   842          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
   854          --- a/changeset-description
 
   843          --- a/changeset-description
 
   855          +++ b/changeset-description
 
   844          +++ b/changeset-description
 
   856          @@ -1,1 +1,1 @@
 
   845          @@ -1,1 +1,1 @@
 
   857          -A0
 
   846          -A0
 
   867 Check that with all option, all changesets are shown
 
   856 Check that with all option, all changesets are shown
 
   868   $ hg obslog --hidden --all 471f378eab4c --patch
 
   857   $ hg obslog --hidden --all 471f378eab4c --patch
 
   869   @    eb5a0daa2192 (3) C0
 
   858   @    eb5a0daa2192 (3) C0
 
   870   |\
 
   859   |\
 
   871   x |  0dec01379d3b (2) B0
 
   860   x |  0dec01379d3b (2) B0
 
   872    /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   861    /     rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   873   |        (No patch available, changesets rebased)
 
   862   |        (No patch available, changesets rebased)
 
   874   |
 
   863   |
 
   875   x  471f378eab4c (1) A0
 
   864   x  471f378eab4c (1) A0
 
   876        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   865        rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   877          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
   866          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
   878          --- a/changeset-description
 
   867          --- a/changeset-description
 
   879          +++ b/changeset-description
 
   868          +++ b/changeset-description
 
   880          @@ -1,1 +1,1 @@
 
   869          @@ -1,1 +1,1 @@
 
   881          -A0
 
   870          -A0
 
   890   
   879   
   891 Check that debugobshistory on the second folded revision show only
 
   880 Check that debugobshistory on the second folded revision show only
 
   892 the revision with the target
 
   881 the revision with the target
 
   893   $ hg obslog --hidden 0dec01379d3b --patch
 
   882   $ hg obslog --hidden 0dec01379d3b --patch
 
   894   x  0dec01379d3b (2) B0
 
   883   x  0dec01379d3b (2) B0
 
   895        rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   884        rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   896          (No patch available, changesets rebased)
 
   885          (No patch available, changesets rebased)
 
   897   
   886   
   898 Check that with all option, all changesets are shown
 
   887 Check that with all option, all changesets are shown
 
   899   $ hg obslog --hidden --all 0dec01379d3b --patch
 
   888   $ hg obslog --hidden --all 0dec01379d3b --patch
 
   900   @    eb5a0daa2192 (3) C0
 
   889   @    eb5a0daa2192 (3) C0
 
   901   |\
 
   890   |\
 
   902   x |  0dec01379d3b (2) B0
 
   891   x |  0dec01379d3b (2) B0
 
   903    /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   892    /     rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   904   |        (No patch available, changesets rebased)
 
   893   |        (No patch available, changesets rebased)
 
   905   |
 
   894   |
 
   906   x  471f378eab4c (1) A0
 
   895   x  471f378eab4c (1) A0
 
   907        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   896        rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   908          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
   897          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
   909          --- a/changeset-description
 
   898          --- a/changeset-description
 
   910          +++ b/changeset-description
 
   899          +++ b/changeset-description
 
   911          @@ -1,1 +1,1 @@
 
   900          @@ -1,1 +1,1 @@
 
   912          -A0
 
   901          -A0
 
   923 graph
 
   912 graph
 
   924   $ hg obslog eb5a0daa2192 --patch
 
   913   $ hg obslog eb5a0daa2192 --patch
 
   925   @    eb5a0daa2192 (3) C0
 
   914   @    eb5a0daa2192 (3) C0
 
   926   |\
 
   915   |\
 
   927   x |  0dec01379d3b (2) B0
 
   916   x |  0dec01379d3b (2) B0
 
   928    /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   917    /     rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   929   |        (No patch available, changesets rebased)
 
   918   |        (No patch available, changesets rebased)
 
   930   |
 
   919   |
 
   931   x  471f378eab4c (1) A0
 
   920   x  471f378eab4c (1) A0
 
   932        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   921        rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   933          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
   922          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
   934          --- a/changeset-description
 
   923          --- a/changeset-description
 
   935          +++ b/changeset-description
 
   924          +++ b/changeset-description
 
   936          @@ -1,1 +1,1 @@
 
   925          @@ -1,1 +1,1 @@
 
   937          -A0
 
   926          -A0
 
   957               {
 
   946               {
 
   958                   "date": [
 
   947                   "date": [
 
   959                       *, (glob)
 
   948                       *, (glob)
 
   960                       0 (glob)
 
   949                       0 (glob)
 
   961                   ],
 
   950                   ],
 
   962                   "effect": [
 
       
   963                       "description",
 
       
   964                       "content"
 
       
   965                   ],
 
       
   966                   "operation": "fold",
 
       
   967                   "succnodes": [
 
   951                   "succnodes": [
 
   968                       "eb5a0daa2192"
 
   952                       "eb5a0daa2192"
 
   969                   ],
 
   953                   ],
 
   970                   "user": "test",
 
   954                   "user": "test",
 
   971                   "verb": "rewritten"
 
   955                   "verb": "rewritten"
 
   980               {
 
   964               {
 
   981                   "date": [
 
   965                   "date": [
 
   982                       *, (glob)
 
   966                       *, (glob)
 
   983                       0 (glob)
 
   967                       0 (glob)
 
   984                   ],
 
   968                   ],
 
   985                   "effect": [
 
       
   986                       "description",
 
       
   987                       "parent",
 
       
   988                       "content"
 
       
   989                   ],
 
       
   990                   "operation": "fold",
 
       
   991                   "succnodes": [
 
   969                   "succnodes": [
 
   992                       "eb5a0daa2192"
 
   970                       "eb5a0daa2192"
 
   993                   ],
 
   971                   ],
 
   994                   "user": "test",
 
   972                   "user": "test",
 
   995                   "verb": "rewritten"
 
   973                   "verb": "rewritten"
 
  1037   |  summary:     A1
 
  1015   |  summary:     A1
 
  1038   |
 
  1016   |
 
  1039   | x  changeset:   1:471f378eab4c
 
  1017   | x  changeset:   1:471f378eab4c
 
  1040   |/   user:        test
 
  1018   |/   user:        test
 
  1041   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1019   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1042   |    obsolete:    reworded using amend as 2:fdf9bde5129a
 
  1020   |    obsolete:    reworded as fdf9bde5129a
 
  1043   |    summary:     A0
 
  1021   |    summary:     A0
 
  1044   |
 
  1022   |
 
  1045   o  changeset:   0:ea207398892e
 
  1023   o  changeset:   0:ea207398892e
 
  1046      user:        test
 
  1024      user:        test
 
  1047      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1025      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1050   $ hg update --hidden 'desc(A0)'
 
  1028   $ hg update --hidden 'desc(A0)'
 
  1051   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
  1029   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
  1052   working directory parent is obsolete! (471f378eab4c)
 
  1030   working directory parent is obsolete! (471f378eab4c)
 
  1053   (use 'hg evolve' to update to its successor: fdf9bde5129a)
 
  1031   (use 'hg evolve' to update to its successor: fdf9bde5129a)
 
  1054   $ hg amend -m "A2"
 
  1032   $ hg amend -m "A2"
 
  1055   2 new content-divergent changesets
 
  1033   2 new divergent changesets
 
  1056   $ hg log --hidden -G
 
  1034   $ hg log --hidden -G
 
  1057   @  changeset:   3:65b757b745b9
 
  1035   @  changeset:   3:65b757b745b9
 
  1058   |  tag:         tip
 
  1036   |  tag:         tip
 
  1059   |  parent:      0:ea207398892e
 
  1037   |  parent:      0:ea207398892e
 
  1060   |  user:        test
 
  1038   |  user:        test
 
  1061   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1039   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1062   |  instability: content-divergent
 
  1040   |  trouble:     divergent
 
  1063   |  summary:     A2
 
  1041   |  summary:     A2
 
  1064   |
 
  1042   |
 
  1065   | o  changeset:   2:fdf9bde5129a
 
  1043   | o  changeset:   2:fdf9bde5129a
 
  1066   |/   parent:      0:ea207398892e
 
  1044   |/   parent:      0:ea207398892e
 
  1067   |    user:        test
 
  1045   |    user:        test
 
  1068   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1046   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1069   |    instability: content-divergent
 
  1047   |    trouble:     divergent
 
  1070   |    summary:     A1
 
  1048   |    summary:     A1
 
  1071   |
 
  1049   |
 
  1072   | x  changeset:   1:471f378eab4c
 
  1050   | x  changeset:   1:471f378eab4c
 
  1073   |/   user:        test
 
  1051   |/   user:        test
 
  1074   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1052   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1075   |    obsolete:    reworded using amend as 2:fdf9bde5129a
 
  1053   |    obsolete:    reworded as fdf9bde5129a
 
  1076   |    obsolete:    reworded using amend as 3:65b757b745b9
 
  1054   |    obsolete:    reworded as 65b757b745b9
 
  1077   |    summary:     A0
 
  1055   |    summary:     A0
 
  1078   |
 
  1056   |
 
  1079   o  changeset:   0:ea207398892e
 
  1057   o  changeset:   0:ea207398892e
 
  1080      user:        test
 
  1058      user:        test
 
  1081      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1059      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1085 -----------
 
  1063 -----------
 
  1086 
  1064 
  1087 Check that debugobshistory on the divergent revision show both destinations
 
  1065 Check that debugobshistory on the divergent revision show both destinations
 
  1088   $ hg obslog --hidden 471f378eab4c --patch
 
  1066   $ hg obslog --hidden 471f378eab4c --patch
 
  1089   x  471f378eab4c (1) A0
 
  1067   x  471f378eab4c (1) A0
 
  1090        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1068        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1091          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1069          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1092          --- a/changeset-description
 
  1070          --- a/changeset-description
 
  1093          +++ b/changeset-description
 
  1071          +++ b/changeset-description
 
  1094          @@ -1,1 +1,1 @@
 
  1072          @@ -1,1 +1,1 @@
 
  1095          -A0
 
  1073          -A0
 
  1096          +A2
 
  1074          +A2
 
  1097   
  1075   
  1098        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1076        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1099          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1077          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1100          --- a/changeset-description
 
  1078          --- a/changeset-description
 
  1101          +++ b/changeset-description
 
  1079          +++ b/changeset-description
 
  1102          @@ -1,1 +1,1 @@
 
  1080          @@ -1,1 +1,1 @@
 
  1103          -A0
 
  1081          -A0
 
  1110   @  65b757b745b9 (3) A2
 
  1088   @  65b757b745b9 (3) A2
 
  1111   |
 
  1089   |
 
  1112   | o  fdf9bde5129a (2) A1
 
  1090   | o  fdf9bde5129a (2) A1
 
  1113   |/
 
  1091   |/
 
  1114   x  471f378eab4c (1) A0
 
  1092   x  471f378eab4c (1) A0
 
  1115        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1093        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1116          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1094          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1117          --- a/changeset-description
 
  1095          --- a/changeset-description
 
  1118          +++ b/changeset-description
 
  1096          +++ b/changeset-description
 
  1119          @@ -1,1 +1,1 @@
 
  1097          @@ -1,1 +1,1 @@
 
  1120          -A0
 
  1098          -A0
 
  1121          +A2
 
  1099          +A2
 
  1122   
  1100   
  1123        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1101        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1124          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1102          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1125          --- a/changeset-description
 
  1103          --- a/changeset-description
 
  1126          +++ b/changeset-description
 
  1104          +++ b/changeset-description
 
  1127          @@ -1,1 +1,1 @@
 
  1105          @@ -1,1 +1,1 @@
 
  1128          -A0
 
  1106          -A0
 
  1139                       0 (glob)
 
  1117                       0 (glob)
 
  1140                   ],
 
  1118                   ],
 
  1141                   "effect": [
 
  1119                   "effect": [
 
  1142                       "description"
 
  1120                       "description"
 
  1143                   ],
 
  1121                   ],
 
  1144                   "operation": "amend",
 
       
  1145                   "succnodes": [
 
  1122                   "succnodes": [
 
  1146                       "65b757b745b9"
 
  1123                       "65b757b745b9"
 
  1147                   ],
 
  1124                   ],
 
  1148                   "user": "test",
 
  1125                   "user": "test",
 
  1149                   "verb": "rewritten"
 
  1126                   "verb": "rewritten"
 
  1154                       0 (glob)
 
  1131                       0 (glob)
 
  1155                   ],
 
  1132                   ],
 
  1156                   "effect": [
 
  1133                   "effect": [
 
  1157                       "description"
 
  1134                       "description"
 
  1158                   ],
 
  1135                   ],
 
  1159                   "operation": "amend",
 
       
  1160                   "succnodes": [
 
  1136                   "succnodes": [
 
  1161                       "fdf9bde5129a"
 
  1137                       "fdf9bde5129a"
 
  1162                   ],
 
  1138                   ],
 
  1163                   "user": "test",
 
  1139                   "user": "test",
 
  1164                   "verb": "rewritten"
 
  1140                   "verb": "rewritten"
 
  1173 and the diverent one
 
  1149 and the diverent one
 
  1174   $ hg obslog fdf9bde5129a --patch
 
  1150   $ hg obslog fdf9bde5129a --patch
 
  1175   o  fdf9bde5129a (2) A1
 
  1151   o  fdf9bde5129a (2) A1
 
  1176   |
 
  1152   |
 
  1177   x  471f378eab4c (1) A0
 
  1153   x  471f378eab4c (1) A0
 
  1178        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1154        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1179          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1155          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1180          --- a/changeset-description
 
  1156          --- a/changeset-description
 
  1181          +++ b/changeset-description
 
  1157          +++ b/changeset-description
 
  1182          @@ -1,1 +1,1 @@
 
  1158          @@ -1,1 +1,1 @@
 
  1183          -A0
 
  1159          -A0
 
  1184          +A2
 
  1160          +A2
 
  1185   
  1161   
  1186        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1162        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1187          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1163          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1188          --- a/changeset-description
 
  1164          --- a/changeset-description
 
  1189          +++ b/changeset-description
 
  1165          +++ b/changeset-description
 
  1190          @@ -1,1 +1,1 @@
 
  1166          @@ -1,1 +1,1 @@
 
  1191          -A0
 
  1167          -A0
 
  1198   @  65b757b745b9 (3) A2
 
  1174   @  65b757b745b9 (3) A2
 
  1199   |
 
  1175   |
 
  1200   | o  fdf9bde5129a (2) A1
 
  1176   | o  fdf9bde5129a (2) A1
 
  1201   |/
 
  1177   |/
 
  1202   x  471f378eab4c (1) A0
 
  1178   x  471f378eab4c (1) A0
 
  1203        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1179        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1204          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1180          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1205          --- a/changeset-description
 
  1181          --- a/changeset-description
 
  1206          +++ b/changeset-description
 
  1182          +++ b/changeset-description
 
  1207          @@ -1,1 +1,1 @@
 
  1183          @@ -1,1 +1,1 @@
 
  1208          -A0
 
  1184          -A0
 
  1209          +A2
 
  1185          +A2
 
  1210   
  1186   
  1211        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1187        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1212          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1188          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1213          --- a/changeset-description
 
  1189          --- a/changeset-description
 
  1214          +++ b/changeset-description
 
  1190          +++ b/changeset-description
 
  1215          @@ -1,1 +1,1 @@
 
  1191          @@ -1,1 +1,1 @@
 
  1216          -A0
 
  1192          -A0
 
  1221 and the diverent one
 
  1197 and the diverent one
 
  1222   $ hg obslog 65b757b745b9 --patch
 
  1198   $ hg obslog 65b757b745b9 --patch
 
  1223   @  65b757b745b9 (3) A2
 
  1199   @  65b757b745b9 (3) A2
 
  1224   |
 
  1200   |
 
  1225   x  471f378eab4c (1) A0
 
  1201   x  471f378eab4c (1) A0
 
  1226        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1202        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1227          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1203          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1228          --- a/changeset-description
 
  1204          --- a/changeset-description
 
  1229          +++ b/changeset-description
 
  1205          +++ b/changeset-description
 
  1230          @@ -1,1 +1,1 @@
 
  1206          @@ -1,1 +1,1 @@
 
  1231          -A0
 
  1207          -A0
 
  1232          +A2
 
  1208          +A2
 
  1233   
  1209   
  1234        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1210        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1235          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1211          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1236          --- a/changeset-description
 
  1212          --- a/changeset-description
 
  1237          +++ b/changeset-description
 
  1213          +++ b/changeset-description
 
  1238          @@ -1,1 +1,1 @@
 
  1214          @@ -1,1 +1,1 @@
 
  1239          -A0
 
  1215          -A0
 
  1245   @  65b757b745b9 (3) A2
 
  1221   @  65b757b745b9 (3) A2
 
  1246   |
 
  1222   |
 
  1247   | o  fdf9bde5129a (2) A1
 
  1223   | o  fdf9bde5129a (2) A1
 
  1248   |/
 
  1224   |/
 
  1249   x  471f378eab4c (1) A0
 
  1225   x  471f378eab4c (1) A0
 
  1250        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1226        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1251          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1227          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1252          --- a/changeset-description
 
  1228          --- a/changeset-description
 
  1253          +++ b/changeset-description
 
  1229          +++ b/changeset-description
 
  1254          @@ -1,1 +1,1 @@
 
  1230          @@ -1,1 +1,1 @@
 
  1255          -A0
 
  1231          -A0
 
  1256          +A2
 
  1232          +A2
 
  1257   
  1233   
  1258        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1234        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1259          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1235          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1260          --- a/changeset-description
 
  1236          --- a/changeset-description
 
  1261          +++ b/changeset-description
 
  1237          +++ b/changeset-description
 
  1262          @@ -1,1 +1,1 @@
 
  1238          @@ -1,1 +1,1 @@
 
  1263          -A0
 
  1239          -A0
 
  1270   @  65b757b745b9 (3) A2
 
  1246   @  65b757b745b9 (3) A2
 
  1271   |
 
  1247   |
 
  1272   | o  fdf9bde5129a (2) A1
 
  1248   | o  fdf9bde5129a (2) A1
 
  1273   |/
 
  1249   |/
 
  1274   x  471f378eab4c (1) A0
 
  1250   x  471f378eab4c (1) A0
 
  1275        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1251        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1276          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1252          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
  1277          --- a/changeset-description
 
  1253          --- a/changeset-description
 
  1278          +++ b/changeset-description
 
  1254          +++ b/changeset-description
 
  1279          @@ -1,1 +1,1 @@
 
  1255          @@ -1,1 +1,1 @@
 
  1280          -A0
 
  1256          -A0
 
  1281          +A2
 
  1257          +A2
 
  1282   
  1258   
  1283        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1259        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1284          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1260          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1285          --- a/changeset-description
 
  1261          --- a/changeset-description
 
  1286          +++ b/changeset-description
 
  1262          +++ b/changeset-description
 
  1287          @@ -1,1 +1,1 @@
 
  1263          @@ -1,1 +1,1 @@
 
  1288          -A0
 
  1264          -A0
 
  1305                       0 (glob)
 
  1281                       0 (glob)
 
  1306                   ],
 
  1282                   ],
 
  1307                   "effect": [
 
  1283                   "effect": [
 
  1308                       "description"
 
  1284                       "description"
 
  1309                   ],
 
  1285                   ],
 
  1310                   "operation": "amend",
 
       
  1311                   "succnodes": [
 
  1286                   "succnodes": [
 
  1312                       "65b757b745b9"
 
  1287                       "65b757b745b9"
 
  1313                   ],
 
  1288                   ],
 
  1314                   "user": "test",
 
  1289                   "user": "test",
 
  1315                   "verb": "rewritten"
 
  1290                   "verb": "rewritten"
 
  1320                       0 (glob)
 
  1295                       0 (glob)
 
  1321                   ],
 
  1296                   ],
 
  1322                   "effect": [
 
  1297                   "effect": [
 
  1323                       "description"
 
  1298                       "description"
 
  1324                   ],
 
  1299                   ],
 
  1325                   "operation": "amend",
 
       
  1326                   "succnodes": [
 
  1300                   "succnodes": [
 
  1327                       "fdf9bde5129a"
 
  1301                       "fdf9bde5129a"
 
  1328                   ],
 
  1302                   ],
 
  1329                   "user": "test",
 
  1303                   "user": "test",
 
  1330                   "verb": "rewritten"
 
  1304                   "verb": "rewritten"
 
  1371   |  summary:     B1
 
  1345   |  summary:     B1
 
  1372   |
 
  1346   |
 
  1373   | x  changeset:   2:0dec01379d3b
 
  1347   | x  changeset:   2:0dec01379d3b
 
  1374   |/   user:        test
 
  1348   |/   user:        test
 
  1375   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1349   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1376   |    obsolete:    reworded using amend as 3:b7ea6d14e664
 
  1350   |    obsolete:    reworded as b7ea6d14e664
 
  1377   |    summary:     B0
 
  1351   |    summary:     B0
 
  1378   |
 
  1352   |
 
  1379   o  changeset:   1:471f378eab4c
 
  1353   o  changeset:   1:471f378eab4c
 
  1380   |  user:        test
 
  1354   |  user:        test
 
  1381   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1355   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1399   |
 
  1373   |
 
  1400   | x  changeset:   3:b7ea6d14e664
 
  1374   | x  changeset:   3:b7ea6d14e664
 
  1401   | |  parent:      1:471f378eab4c
 
  1375   | |  parent:      1:471f378eab4c
 
  1402   | |  user:        test
 
  1376   | |  user:        test
 
  1403   | |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1377   | |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1404   | |  obsolete:    rewritten using fold as 4:eb5a0daa2192
 
  1378   | |  obsolete:    rewritten as eb5a0daa2192
 
  1405   | |  summary:     B1
 
  1379   | |  summary:     B1
 
  1406   | |
 
  1380   | |
 
  1407   | | x  changeset:   2:0dec01379d3b
 
  1381   | | x  changeset:   2:0dec01379d3b
 
  1408   | |/   user:        test
 
  1382   | |/   user:        test
 
  1409   | |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1383   | |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1410   | |    obsolete:    reworded using amend as 3:b7ea6d14e664
 
  1384   | |    obsolete:    reworded as b7ea6d14e664
 
  1411   | |    summary:     B0
 
  1385   | |    summary:     B0
 
  1412   | |
 
  1386   | |
 
  1413   | x  changeset:   1:471f378eab4c
 
  1387   | x  changeset:   1:471f378eab4c
 
  1414   |/   user:        test
 
  1388   |/   user:        test
 
  1415   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1389   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1416   |    obsolete:    rewritten using fold as 4:eb5a0daa2192
 
  1390   |    obsolete:    rewritten as eb5a0daa2192
 
  1417   |    summary:     A0
 
  1391   |    summary:     A0
 
  1418   |
 
  1392   |
 
  1419   o  changeset:   0:ea207398892e
 
  1393   o  changeset:   0:ea207398892e
 
  1420      user:        test
 
  1394      user:        test
 
  1421      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1395      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1427 Check that debugobshistory on head show a coherent graph
 
  1401 Check that debugobshistory on head show a coherent graph
 
  1428   $ hg obslog eb5a0daa2192 --patch
 
  1402   $ hg obslog eb5a0daa2192 --patch
 
  1429   @    eb5a0daa2192 (4) C0
 
  1403   @    eb5a0daa2192 (4) C0
 
  1430   |\
 
  1404   |\
 
  1431   x |  471f378eab4c (1) A0
 
  1405   x |  471f378eab4c (1) A0
 
  1432    /     rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1406    /     rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1433   |        diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
  1407   |        diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
  1434   |        --- a/changeset-description
 
  1408   |        --- a/changeset-description
 
  1435   |        +++ b/changeset-description
 
  1409   |        +++ b/changeset-description
 
  1436   |        @@ -1,1 +1,1 @@
 
  1410   |        @@ -1,1 +1,1 @@
 
  1437   |        -A0
 
  1411   |        -A0
 
  1443   |        @@ -0,0 +1,1 @@
 
  1417   |        @@ -0,0 +1,1 @@
 
  1444   |        +B0
 
  1418   |        +B0
 
  1445   |
 
  1419   |
 
  1446   |
 
  1420   |
 
  1447   x  b7ea6d14e664 (3) B1
 
  1421   x  b7ea6d14e664 (3) B1
 
  1448   |    rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1422   |    rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1449   |      (No patch available, changesets rebased)
 
  1423   |      (No patch available, changesets rebased)
 
  1450   |
 
  1424   |
 
  1451   x  0dec01379d3b (2) B0
 
  1425   x  0dec01379d3b (2) B0
 
  1452        rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1426        rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1453          diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
 
  1427          diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
 
  1454          --- a/changeset-description
 
  1428          --- a/changeset-description
 
  1455          +++ b/changeset-description
 
  1429          +++ b/changeset-description
 
  1456          @@ -1,1 +1,1 @@
 
  1430          @@ -1,1 +1,1 @@
 
  1457          -B0
 
  1431          -B0
 
  1461 Check that obslog on ROOT with all option show everything
 
  1435 Check that obslog on ROOT with all option show everything
 
  1462   $ hg obslog 1 --hidden --all --patch
 
  1436   $ hg obslog 1 --hidden --all --patch
 
  1463   @    eb5a0daa2192 (4) C0
 
  1437   @    eb5a0daa2192 (4) C0
 
  1464   |\
 
  1438   |\
 
  1465   x |  471f378eab4c (1) A0
 
  1439   x |  471f378eab4c (1) A0
 
  1466    /     rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1440    /     rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1467   |        diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
  1441   |        diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
 
  1468   |        --- a/changeset-description
 
  1442   |        --- a/changeset-description
 
  1469   |        +++ b/changeset-description
 
  1443   |        +++ b/changeset-description
 
  1470   |        @@ -1,1 +1,1 @@
 
  1444   |        @@ -1,1 +1,1 @@
 
  1471   |        -A0
 
  1445   |        -A0
 
  1477   |        @@ -0,0 +1,1 @@
 
  1451   |        @@ -0,0 +1,1 @@
 
  1478   |        +B0
 
  1452   |        +B0
 
  1479   |
 
  1453   |
 
  1480   |
 
  1454   |
 
  1481   x  b7ea6d14e664 (3) B1
 
  1455   x  b7ea6d14e664 (3) B1
 
  1482   |    rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1456   |    rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1483   |      (No patch available, changesets rebased)
 
  1457   |      (No patch available, changesets rebased)
 
  1484   |
 
  1458   |
 
  1485   x  0dec01379d3b (2) B0
 
  1459   x  0dec01379d3b (2) B0
 
  1486        rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1460        rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1487          diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
 
  1461          diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
 
  1488          --- a/changeset-description
 
  1462          --- a/changeset-description
 
  1489          +++ b/changeset-description
 
  1463          +++ b/changeset-description
 
  1490          @@ -1,1 +1,1 @@
 
  1464          @@ -1,1 +1,1 @@
 
  1491          -B0
 
  1465          -B0
 
  1505               {
 
  1479               {
 
  1506                   "date": [
 
  1480                   "date": [
 
  1507                       *, (glob)
 
  1481                       *, (glob)
 
  1508                       0 (glob)
 
  1482                       0 (glob)
 
  1509                   ],
 
  1483                   ],
 
  1510                   "effect": [
 
       
  1511                       *, (glob)
 
       
  1512                       *, (glob)
 
       
  1513                       "content"
 
       
  1514                   ],
 
       
  1515                   "operation": "fold",
 
       
  1516                   "succnodes": [
 
  1484                   "succnodes": [
 
  1517                       "eb5a0daa2192"
 
  1485                       "eb5a0daa2192"
 
  1518                   ],
 
  1486                   ],
 
  1519                   "user": "test",
 
  1487                   "user": "test",
 
  1520                   "verb": "rewritten"
 
  1488                   "verb": "rewritten"
 
  1532                       0 (glob)
 
  1500                       0 (glob)
 
  1533                   ],
 
  1501                   ],
 
  1534                   "effect": [
 
  1502                   "effect": [
 
  1535                       "description"
 
  1503                       "description"
 
  1536                   ],
 
  1504                   ],
 
  1537                   "operation": "amend",
 
       
  1538                   "succnodes": [
 
  1505                   "succnodes": [
 
  1539                       "b7ea6d14e664"
 
  1506                       "b7ea6d14e664"
 
  1540                   ],
 
  1507                   ],
 
  1541                   "user": "test",
 
  1508                   "user": "test",
 
  1542                   "verb": "rewritten"
 
  1509                   "verb": "rewritten"
 
  1551               {
 
  1518               {
 
  1552                   "date": [
 
  1519                   "date": [
 
  1553                       *, (glob)
 
  1520                       *, (glob)
 
  1554                       0 (glob)
 
  1521                       0 (glob)
 
  1555                   ],
 
  1522                   ],
 
  1556                   "effect": [
 
       
  1557                       "description",
 
       
  1558                       "content"
 
       
  1559                   ],
 
       
  1560                   "operation": "fold",
 
       
  1561                   "succnodes": [
 
  1523                   "succnodes": [
 
  1562                       "eb5a0daa2192"
 
  1524                       "eb5a0daa2192"
 
  1563                   ],
 
  1525                   ],
 
  1564                   "user": "test",
 
  1526                   "user": "test",
 
  1565                   "verb": "rewritten"
 
  1527                   "verb": "rewritten"
 
  1638   |
 
  1600   |
 
  1639   | x  changeset:   2:fdf9bde5129a
 
  1601   | x  changeset:   2:fdf9bde5129a
 
  1640   |/   parent:      0:ea207398892e
 
  1602   |/   parent:      0:ea207398892e
 
  1641   |    user:        test
 
  1603   |    user:        test
 
  1642   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1604   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1643   |    obsolete:    reworded using amend as 3:7a230b46bf61
 
  1605   |    obsolete:    reworded as 7a230b46bf61
 
  1644   |    summary:     A1
 
  1606   |    summary:     A1
 
  1645   |
 
  1607   |
 
  1646   | x  changeset:   1:471f378eab4c
 
  1608   | x  changeset:   1:471f378eab4c
 
  1647   |/   user:        test
 
  1609   |/   user:        test
 
  1648   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1610   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1649   |    obsolete:    reworded using amend as 2:fdf9bde5129a
 
  1611   |    obsolete:    reworded as fdf9bde5129a
 
  1650   |    summary:     A0
 
  1612   |    summary:     A0
 
  1651   |
 
  1613   |
 
  1652   o  changeset:   0:ea207398892e
 
  1614   o  changeset:   0:ea207398892e
 
  1653      user:        test
 
  1615      user:        test
 
  1654      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1616      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1659 
  1621 
  1660   $ hg obslog 7a230b46bf61 --patch
 
  1622   $ hg obslog 7a230b46bf61 --patch
 
  1661   @  7a230b46bf61 (3) A2
 
  1623   @  7a230b46bf61 (3) A2
 
  1662   |
 
  1624   |
 
  1663   x  fdf9bde5129a (2) A1
 
  1625   x  fdf9bde5129a (2) A1
 
  1664   |    rewritten(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1626   |    rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1665   |      diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description
 
  1627   |      diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description
 
  1666   |      --- a/changeset-description
 
  1628   |      --- a/changeset-description
 
  1667   |      +++ b/changeset-description
 
  1629   |      +++ b/changeset-description
 
  1668   |      @@ -1,1 +1,1 @@
 
  1630   |      @@ -1,1 +1,1 @@
 
  1669   |      -A1
 
  1631   |      -A1
 
  1670   |      +A2
 
  1632   |      +A2
 
  1671   |
 
  1633   |
 
  1672   |
 
  1634   |
 
  1673   x  471f378eab4c (1) A0
 
  1635   x  471f378eab4c (1) A0
 
  1674        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1636        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1675          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1637          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
  1676          --- a/changeset-description
 
  1638          --- a/changeset-description
 
  1677          +++ b/changeset-description
 
  1639          +++ b/changeset-description
 
  1678          @@ -1,1 +1,1 @@
 
  1640          @@ -1,1 +1,1 @@
 
  1679          -A0
 
  1641          -A0
 
  1688   adding manifests
 
  1650   adding manifests
 
  1689   adding file changes
 
  1651   adding file changes
 
  1690   added 1 changesets with 0 changes to 1 files (+1 heads)
 
  1652   added 1 changesets with 0 changes to 1 files (+1 heads)
 
  1691   2 new obsolescence markers
 
  1653   2 new obsolescence markers
 
  1692   obsoleted 1 changesets
 
  1654   obsoleted 1 changesets
 
  1693   new changesets 7a230b46bf61
 
       
  1694   (run 'hg heads' to see heads, 'hg merge' to merge)
 
  1655   (run 'hg heads' to see heads, 'hg merge' to merge)
 
  1695   working directory parent is obsolete! (471f378eab4c)
 
  1656   working directory parent is obsolete! (471f378eab4c)
 
  1696   (use 'hg evolve' to update to its successor: 7a230b46bf61)
 
  1657   (use 'hg evolve' to update to its successor: 7a230b46bf61)
 
  1697 Check that debugobshistory works with markers pointing to missing local
 
  1658 Check that debugobshistory works with markers pointing to missing local
 
  1698 changectx
 
  1659 changectx
 
  1699   $ hg obslog 7a230b46bf61 --patch
 
  1660   $ hg obslog 7a230b46bf61 --patch
 
  1700   o  7a230b46bf61 (2) A2
 
  1661   o  7a230b46bf61 (2) A2
 
  1701   |
 
  1662   |
 
  1702   x  fdf9bde5129a
 
  1663   x  fdf9bde5129a
 
  1703   |    rewritten(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1664   |    rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1704   |      (No patch available, context is not local)
 
  1665   |      (No patch available, context is not local)
 
  1705   |
 
  1666   |
 
  1706   @  471f378eab4c (1) A0
 
  1667   @  471f378eab4c (1) A0
 
  1707        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1668        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
  1708          (No patch available, successor is unknown locally)
 
  1669          (No patch available, successor is unknown locally)
 
  1709   
  1670   
  1710   $ hg obslog 7a230b46bf61 --color=debug --patch
 
  1671   $ hg obslog 7a230b46bf61 --color=debug --patch
 
  1711   o  [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
 
  1672   o  [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
 
  1712   |
 
  1673   |
 
  1713   x  [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
 
  1674   x  [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
 
  1714   |    [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
 
  1675   |    [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
 
  1715   |      (No patch available, context is not local)
 
  1676   |      (No patch available, context is not local)
 
  1716   |
 
  1677   |
 
  1717   @  [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
 
  1678   @  [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
 
  1718        [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
 
  1679        [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
 
  1719          (No patch available, successor is unknown locally)
 
  1680          (No patch available, successor is unknown locally)
 
  1720   
  1681
evolve