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 3287 4303a46b4167
parent 3223 73b4e84df0bd
parent 3166 e1a230cc4527
child 3288 b714709afe6a
child 3418 85cdce113c2c
equal deleted inserted replaced
3286:76c447d88d9a 3287:4303a46b4167 
    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 by test (*) (glob)
 
    64        rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
 
    59          --- a/471f378eab4c-changeset-description
 
    65          --- a/471f378eab4c-changeset-description
 
    60          +++ b/4ae3a4151de9-changeset-description
 
    66          +++ b/4ae3a4151de9-changeset-description
 
    72          +42
 
    78          +42
 
    73   
    79   
    74   
    80   
    75 
    81 
    76   $ hg obslog --no-graph --patch 4ae3a4151de9
 
    82   $ hg obslog --no-graph --patch 4ae3a4151de9
 
    77   4ae3a4151de9 (2) A1
 
    83   4ae3a4151de9 (3) A1
 
    78   471f378eab4c (1) A0
 
    84   471f378eab4c (1) A0
 
    79     rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
    85     rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
    80       --- a/471f378eab4c-changeset-description	
    86       --- a/471f378eab4c-changeset-description	
    81       +++ b/4ae3a4151de9-changeset-description	
    87       +++ b/4ae3a4151de9-changeset-description	
    82       @@ -1,1 +1,3 @@
 
    88       @@ -1,1 +1,3 @@
 
   101   $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
 
   107   $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
 
   102   [
 
   108   [
 
   103       {
 
   109       {
 
   104           "markers": [],
 
   110           "markers": [],
 
   105           "node": "4ae3a4151de9",
 
   111           "node": "4ae3a4151de9",
 
   106           "rev": 2,
 
   112           "rev": 3,
 
   107           "shortdescription": "A1"
 
   113           "shortdescription": "A1"
 
   108       },
 
   114       },
 
   109       {
 
   115       {
 
   110           "markers": [
 
   116           "markers": [
 
   111               {
 
   117               {
 
   314   > n
 
   320   > n
 
   315   > n
 
   321   > n
 
   316   > y
 
   322   > y
 
   317   > y
 
   323   > y
 
   318   > EOF
 
   324   > EOF
 
       
   325   current hg version does not support storing note in obsmarker
 
   319   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   326   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   320   adding a
 
   327   adding a
 
   321   adding b
 
   328   adding b
 
   322   diff --git a/a b/a
 
   329   diff --git a/a b/a
 
   323   new file mode 100644
 
   330   new file mode 100644
 
   357   |  summary:     A0
 
   364   |  summary:     A0
 
   358   |
 
   365   |
 
   359   | x  changeset:   1:471597cad322
 
   366   | x  changeset:   1:471597cad322
 
   360   |/   user:        test
 
   367   |/   user:        test
 
   361   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   368   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   362   |    obsolete:    split as 2:337fec4d2edc, 3:f257fde29c7a
 
   369   |    obsolete:    split as 337fec4d2edc, f257fde29c7a
 
   363   |    summary:     A0
 
   370   |    summary:     A0
 
   364   |
 
   371   |
 
   365   o  changeset:   0:ea207398892e
 
   372   o  changeset:   0:ea207398892e
 
   366      user:        test
 
   373      user:        test
 
   367      date:        Thu Jan 01 00:00:00 1970 +0000
 
   374      date:        Thu Jan 01 00:00:00 1970 +0000
 
   619   |  summary:     A0
 
   626   |  summary:     A0
 
   620   |
 
   627   |
 
   621   | x  changeset:   1:de7290d8b885
 
   628   | x  changeset:   1:de7290d8b885
 
   622   |/   user:        test
 
   629   |/   user:        test
 
   623   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   630   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   624   |    obsolete:    split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b
 
   631   |    obsolete:    split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a
 
   625   |    summary:     A0
 
   632   |    summary:     A0
 
   626   |
 
   633   |
 
   627   o  changeset:   0:ea207398892e
 
   634   o  changeset:   0:ea207398892e
 
   628      user:        test
 
   635      user:        test
 
   629      date:        Thu Jan 01 00:00:00 1970 +0000
 
   636      date:        Thu Jan 01 00:00:00 1970 +0000
 
   795   |  summary:     C0
 
   802   |  summary:     C0
 
   796   |
 
   803   |
 
   797   | x  changeset:   2:0dec01379d3b
 
   804   | x  changeset:   2:0dec01379d3b
 
   798   | |  user:        test
 
   805   | |  user:        test
 
   799   | |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   806   | |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   800   | |  obsolete:    rewritten as 3:eb5a0daa2192
 
   807   | |  obsolete:    rewritten as eb5a0daa2192
 
   801   | |  summary:     B0
 
   808   | |  summary:     B0
 
   802   | |
 
   809   | |
 
   803   | x  changeset:   1:471f378eab4c
 
   810   | x  changeset:   1:471f378eab4c
 
   804   |/   user:        test
 
   811   |/   user:        test
 
   805   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   812   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   806   |    obsolete:    rewritten as 3:eb5a0daa2192
 
   813   |    obsolete:    rewritten as eb5a0daa2192
 
   807   |    summary:     A0
 
   814   |    summary:     A0
 
   808   |
 
   815   |
 
   809   o  changeset:   0:ea207398892e
 
   816   o  changeset:   0:ea207398892e
 
   810      user:        test
 
   817      user:        test
 
   811      date:        Thu Jan 01 00:00:00 1970 +0000
 
   818      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1002   |  summary:     A1
 
  1009   |  summary:     A1
 
  1003   |
 
  1010   |
 
  1004   | x  changeset:   1:471f378eab4c
 
  1011   | x  changeset:   1:471f378eab4c
 
  1005   |/   user:        test
 
  1012   |/   user:        test
 
  1006   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1013   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1007   |    obsolete:    reworded using amend as 2:fdf9bde5129a
 
  1014   |    obsolete:    reworded as fdf9bde5129a
 
  1008   |    summary:     A0
 
  1015   |    summary:     A0
 
  1009   |
 
  1016   |
 
  1010   o  changeset:   0:ea207398892e
 
  1017   o  changeset:   0:ea207398892e
 
  1011      user:        test
 
  1018      user:        test
 
  1012      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1019      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1015   $ hg update --hidden 'desc(A0)'
 
  1022   $ hg update --hidden 'desc(A0)'
 
  1016   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
  1023   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
  1017   working directory parent is obsolete! (471f378eab4c)
 
  1024   working directory parent is obsolete! (471f378eab4c)
 
  1018   (use 'hg evolve' to update to its successor: fdf9bde5129a)
 
  1025   (use 'hg evolve' to update to its successor: fdf9bde5129a)
 
  1019   $ hg amend -m "A2"
 
  1026   $ hg amend -m "A2"
 
  1020   2 new content-divergent changesets
 
  1027   2 new divergent changesets
 
  1021   $ hg log --hidden -G
 
  1028   $ hg log --hidden -G
 
  1022   @  changeset:   3:65b757b745b9
 
  1029   @  changeset:   3:65b757b745b9
 
  1023   |  tag:         tip
 
  1030   |  tag:         tip
 
  1024   |  parent:      0:ea207398892e
 
  1031   |  parent:      0:ea207398892e
 
  1025   |  user:        test
 
  1032   |  user:        test
 
  1026   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1033   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1027   |  instability: content-divergent
 
  1034   |  trouble:     divergent
 
  1028   |  summary:     A2
 
  1035   |  summary:     A2
 
  1029   |
 
  1036   |
 
  1030   | o  changeset:   2:fdf9bde5129a
 
  1037   | o  changeset:   2:fdf9bde5129a
 
  1031   |/   parent:      0:ea207398892e
 
  1038   |/   parent:      0:ea207398892e
 
  1032   |    user:        test
 
  1039   |    user:        test
 
  1033   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1040   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1034   |    instability: content-divergent
 
  1041   |    trouble:     divergent
 
  1035   |    summary:     A1
 
  1042   |    summary:     A1
 
  1036   |
 
  1043   |
 
  1037   | x  changeset:   1:471f378eab4c
 
  1044   | x  changeset:   1:471f378eab4c
 
  1038   |/   user:        test
 
  1045   |/   user:        test
 
  1039   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1046   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1040   |    obsolete:    reworded using amend as 2:fdf9bde5129a
 
  1047   |    obsolete:    reworded as fdf9bde5129a
 
  1041   |    obsolete:    reworded using amend as 3:65b757b745b9
 
  1048   |    obsolete:    reworded as 65b757b745b9
 
  1042   |    summary:     A0
 
  1049   |    summary:     A0
 
  1043   |
 
  1050   |
 
  1044   o  changeset:   0:ea207398892e
 
  1051   o  changeset:   0:ea207398892e
 
  1045      user:        test
 
  1052      user:        test
 
  1046      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1053      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1318   |  summary:     B1
 
  1325   |  summary:     B1
 
  1319   |
 
  1326   |
 
  1320   | x  changeset:   2:0dec01379d3b
 
  1327   | x  changeset:   2:0dec01379d3b
 
  1321   |/   user:        test
 
  1328   |/   user:        test
 
  1322   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1329   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1323   |    obsolete:    reworded using amend as 3:b7ea6d14e664
 
  1330   |    obsolete:    reworded as b7ea6d14e664
 
  1324   |    summary:     B0
 
  1331   |    summary:     B0
 
  1325   |
 
  1332   |
 
  1326   o  changeset:   1:471f378eab4c
 
  1333   o  changeset:   1:471f378eab4c
 
  1327   |  user:        test
 
  1334   |  user:        test
 
  1328   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1335   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1346   |
 
  1353   |
 
  1347   | x  changeset:   3:b7ea6d14e664
 
  1354   | x  changeset:   3:b7ea6d14e664
 
  1348   | |  parent:      1:471f378eab4c
 
  1355   | |  parent:      1:471f378eab4c
 
  1349   | |  user:        test
 
  1356   | |  user:        test
 
  1350   | |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1357   | |  date:        Thu Jan 01 00:00:00 1970 +0000
 
  1351   | |  obsolete:    rewritten as 4:eb5a0daa2192
 
  1358   | |  obsolete:    rewritten as eb5a0daa2192
 
  1352   | |  summary:     B1
 
  1359   | |  summary:     B1
 
  1353   | |
 
  1360   | |
 
  1354   | | x  changeset:   2:0dec01379d3b
 
  1361   | | x  changeset:   2:0dec01379d3b
 
  1355   | |/   user:        test
 
  1362   | |/   user:        test
 
  1356   | |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1363   | |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1357   | |    obsolete:    reworded using amend as 3:b7ea6d14e664
 
  1364   | |    obsolete:    reworded as b7ea6d14e664
 
  1358   | |    summary:     B0
 
  1365   | |    summary:     B0
 
  1359   | |
 
  1366   | |
 
  1360   | x  changeset:   1:471f378eab4c
 
  1367   | x  changeset:   1:471f378eab4c
 
  1361   |/   user:        test
 
  1368   |/   user:        test
 
  1362   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1369   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1363   |    obsolete:    rewritten as 4:eb5a0daa2192
 
  1370   |    obsolete:    rewritten as eb5a0daa2192
 
  1364   |    summary:     A0
 
  1371   |    summary:     A0
 
  1365   |
 
  1372   |
 
  1366   o  changeset:   0:ea207398892e
 
  1373   o  changeset:   0:ea207398892e
 
  1367      user:        test
 
  1374      user:        test
 
  1368      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1375      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1582   |
 
  1589   |
 
  1583   | x  changeset:   2:fdf9bde5129a
 
  1590   | x  changeset:   2:fdf9bde5129a
 
  1584   |/   parent:      0:ea207398892e
 
  1591   |/   parent:      0:ea207398892e
 
  1585   |    user:        test
 
  1592   |    user:        test
 
  1586   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1593   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1587   |    obsolete:    reworded using amend as 3:7a230b46bf61
 
  1594   |    obsolete:    reworded as 7a230b46bf61
 
  1588   |    summary:     A1
 
  1595   |    summary:     A1
 
  1589   |
 
  1596   |
 
  1590   | x  changeset:   1:471f378eab4c
 
  1597   | x  changeset:   1:471f378eab4c
 
  1591   |/   user:        test
 
  1598   |/   user:        test
 
  1592   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1599   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
  1593   |    obsolete:    reworded using amend as 2:fdf9bde5129a
 
  1600   |    obsolete:    reworded as fdf9bde5129a
 
  1594   |    summary:     A0
 
  1601   |    summary:     A0
 
  1595   |
 
  1602   |
 
  1596   o  changeset:   0:ea207398892e
 
  1603   o  changeset:   0:ea207398892e
 
  1597      user:        test
 
  1604      user:        test
 
  1598      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1605      date:        Thu Jan 01 00:00:00 1970 +0000
 
  1630   adding manifests
 
  1637   adding manifests
 
  1631   adding file changes
 
  1638   adding file changes
 
  1632   added 1 changesets with 0 changes to 1 files (+1 heads)
 
  1639   added 1 changesets with 0 changes to 1 files (+1 heads)
 
  1633   2 new obsolescence markers
 
  1640   2 new obsolescence markers
 
  1634   obsoleted 1 changesets
 
  1641   obsoleted 1 changesets
 
  1635   new changesets 7a230b46bf61
 
       
  1636   (run 'hg heads' to see heads, 'hg merge' to merge)
 
  1642   (run 'hg heads' to see heads, 'hg merge' to merge)
 
  1637   working directory parent is obsolete! (471f378eab4c)
 
  1643   working directory parent is obsolete! (471f378eab4c)
 
  1638   (use 'hg evolve' to update to its successor: 7a230b46bf61)
 
  1644   (use 'hg evolve' to update to its successor: 7a230b46bf61)
 
  1639 Check that debugobshistory works with markers pointing to missing local
 
  1645 Check that debugobshistory works with markers pointing to missing local
 
  1640 changectx
 
  1646 changectx
evolve