tests/test-evolve-obshistory.t
branchmercurial-4.4
changeset 3714 19ec729f3ca2
parent 3712 fbcf9e92097e
parent 3590 d5adce52cef4
child 3715 a77fb9669e99
child 3817 5ca297e78f2c
equal deleted inserted replaced
3713:4358f29af833 3714:19ec729f3ca2
   203   $ hg update 471f378eab4c
   203   $ hg update 471f378eab4c
   204   abort: hidden revision '471f378eab4c'!
   204   abort: hidden revision '471f378eab4c'!
   205   (use --hidden to access hidden revisions; successor: 4ae3a4151de9)
   205   (use --hidden to access hidden revisions; successor: 4ae3a4151de9)
   206   [255]
   206   [255]
   207   $ hg update --hidden "desc(A0)"
   207   $ hg update --hidden "desc(A0)"
   208   updating to a hidden changeset 471f378eab4c
       
   209   (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
       
   210   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   208   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   211   working directory parent is obsolete! (471f378eab4c)
   209   working directory parent is obsolete! (471f378eab4c)
   212   (use 'hg evolve' to update to its successor: 4ae3a4151de9)
   210   (use 'hg evolve' to update to its successor: 4ae3a4151de9)
   213 
   211 
   214 Test output with pruned commit
   212 Test output with pruned commit
   306   $ hg up 0dec01379d3b
   304   $ hg up 0dec01379d3b
   307   abort: hidden revision '0dec01379d3b'!
   305   abort: hidden revision '0dec01379d3b'!
   308   (use --hidden to access hidden revisions; pruned)
   306   (use --hidden to access hidden revisions; pruned)
   309   [255]
   307   [255]
   310   $ hg up --hidden -r 'desc(B0)'
   308   $ hg up --hidden -r 'desc(B0)'
   311   updating to a hidden changeset 0dec01379d3b
       
   312   (hidden revision '0dec01379d3b' is pruned)
       
   313   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   309   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   314   working directory parent is obsolete! (0dec01379d3b)
   310   working directory parent is obsolete! (0dec01379d3b)
   315   (use 'hg evolve' to update to its parent successor)
   311   (use 'hg evolve' to update to its parent successor)
   316 
   312 
   317 Test output with splitted commit
   313 Test output with splitted commit
   505   $ hg update 471597cad322
   501   $ hg update 471597cad322
   506   abort: hidden revision '471597cad322'!
   502   abort: hidden revision '471597cad322'!
   507   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
   503   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
   508   [255]
   504   [255]
   509   $ hg update --hidden 'min(desc(A0))'
   505   $ hg update --hidden 'min(desc(A0))'
   510   updating to a hidden changeset 471597cad322
       
   511   (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
       
   512   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   506   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   513   working directory parent is obsolete! (471597cad322)
   507   working directory parent is obsolete! (471597cad322)
   514   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   508   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   515 
   509 
   516 Test output with lots of splitted commit
   510 Test output with lots of splitted commit
   786   $ hg update de7290d8b885
   780   $ hg update de7290d8b885
   787   abort: hidden revision 'de7290d8b885'!
   781   abort: hidden revision 'de7290d8b885'!
   788   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
   782   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
   789   [255]
   783   [255]
   790   $ hg update --hidden 'min(desc(A0))'
   784   $ hg update --hidden 'min(desc(A0))'
   791   updating to a hidden changeset de7290d8b885
       
   792   (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
       
   793   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   785   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   794   working directory parent is obsolete! (de7290d8b885)
   786   working directory parent is obsolete! (de7290d8b885)
   795   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
   787   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
   796 
   788 
   797 Test output with folded commit
   789 Test output with folded commit
  1011   $ hg update 471f378eab4c
  1003   $ hg update 471f378eab4c
  1012   abort: hidden revision '471f378eab4c'!
  1004   abort: hidden revision '471f378eab4c'!
  1013   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
  1005   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
  1014   [255]
  1006   [255]
  1015   $ hg update --hidden 'desc(A0)'
  1007   $ hg update --hidden 'desc(A0)'
  1016   updating to a hidden changeset 471f378eab4c
       
  1017   (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
       
  1018   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1008   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1019   working directory parent is obsolete! (471f378eab4c)
  1009   working directory parent is obsolete! (471f378eab4c)
  1020   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1010   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1021   $ hg update 0dec01379d3b
  1011   $ hg update 0dec01379d3b
  1022   abort: hidden revision '0dec01379d3b'!
  1012   abort: hidden revision '0dec01379d3b'!
  1023   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
  1013   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
  1024   [255]
  1014   [255]
  1025   $ hg update --hidden 'desc(B0)'
  1015   $ hg update --hidden 'desc(B0)'
  1026   updating to a hidden changeset 0dec01379d3b
       
  1027   (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
       
  1028   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1016   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1029   working directory parent is obsolete! (0dec01379d3b)
  1017   working directory parent is obsolete! (0dec01379d3b)
  1030   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1018   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1031 
  1019 
  1032 Test output with divergence
  1020 Test output with divergence
  1058      user:        test
  1046      user:        test
  1059      date:        Thu Jan 01 00:00:00 1970 +0000
  1047      date:        Thu Jan 01 00:00:00 1970 +0000
  1060      summary:     ROOT
  1048      summary:     ROOT
  1061   
  1049   
  1062   $ hg update --hidden 'desc(A0)'
  1050   $ hg update --hidden 'desc(A0)'
  1063   updating to a hidden changeset 471f378eab4c
       
  1064   (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
       
  1065   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1051   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1066   working directory parent is obsolete! (471f378eab4c)
  1052   working directory parent is obsolete! (471f378eab4c)
  1067   (use 'hg evolve' to update to its successor: fdf9bde5129a)
  1053   (use 'hg evolve' to update to its successor: fdf9bde5129a)
  1068   $ hg amend -m "A2"
  1054   $ hg amend -m "A2"
  1069   2 new content-divergent changesets
  1055   2 new content-divergent changesets
  1074   |  user:        test
  1060   |  user:        test
  1075   |  date:        Thu Jan 01 00:00:00 1970 +0000
  1061   |  date:        Thu Jan 01 00:00:00 1970 +0000
  1076   |  instability: content-divergent
  1062   |  instability: content-divergent
  1077   |  summary:     A2
  1063   |  summary:     A2
  1078   |
  1064   |
  1079   | *  changeset:   2:fdf9bde5129a
  1065   | o  changeset:   2:fdf9bde5129a
  1080   |/   parent:      0:ea207398892e
  1066   |/   parent:      0:ea207398892e
  1081   |    user:        test
  1067   |    user:        test
  1082   |    date:        Thu Jan 01 00:00:00 1970 +0000
  1068   |    date:        Thu Jan 01 00:00:00 1970 +0000
  1083   |    instability: content-divergent
  1069   |    instability: content-divergent
  1084   |    summary:     A1
  1070   |    summary:     A1
  1121 
  1107 
  1122 Check that with all option, every changeset is shown
  1108 Check that with all option, every changeset is shown
  1123   $ hg obslog --hidden --all 471f378eab4c --patch
  1109   $ hg obslog --hidden --all 471f378eab4c --patch
  1124   @  65b757b745b9 (3) A2
  1110   @  65b757b745b9 (3) A2
  1125   |
  1111   |
  1126   | *  fdf9bde5129a (2) A1
  1112   | o  fdf9bde5129a (2) A1
  1127   |/
  1113   |/
  1128   x  471f378eab4c (1) A0
  1114   x  471f378eab4c (1) A0
  1129        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
  1115        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
  1130          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
  1116          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
  1131          --- a/changeset-description
  1117          --- a/changeset-description
  1184       }
  1170       }
  1185   ]
  1171   ]
  1186 Check that debugobshistory on the first diverged revision show the revision
  1172 Check that debugobshistory on the first diverged revision show the revision
  1187 and the diverent one
  1173 and the diverent one
  1188   $ hg obslog fdf9bde5129a --patch
  1174   $ hg obslog fdf9bde5129a --patch
  1189   *  fdf9bde5129a (2) A1
  1175   o  fdf9bde5129a (2) A1
  1190   |
  1176   |
  1191   x  471f378eab4c (1) A0
  1177   x  471f378eab4c (1) A0
  1192        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
  1178        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
  1193          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
  1179          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
  1194          --- a/changeset-description
  1180          --- a/changeset-description
  1209 
  1195 
  1210 Check that all option show all of them
  1196 Check that all option show all of them
  1211   $ hg obslog fdf9bde5129a -a --patch
  1197   $ hg obslog fdf9bde5129a -a --patch
  1212   @  65b757b745b9 (3) A2
  1198   @  65b757b745b9 (3) A2
  1213   |
  1199   |
  1214   | *  fdf9bde5129a (2) A1
  1200   | o  fdf9bde5129a (2) A1
  1215   |/
  1201   |/
  1216   x  471f378eab4c (1) A0
  1202   x  471f378eab4c (1) A0
  1217        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
  1203        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
  1218          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
  1204          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
  1219          --- a/changeset-description
  1205          --- a/changeset-description
  1256   
  1242   
  1257 Check that all option show all of them
  1243 Check that all option show all of them
  1258   $ hg obslog 65b757b745b9 -a --patch
  1244   $ hg obslog 65b757b745b9 -a --patch
  1259   @  65b757b745b9 (3) A2
  1245   @  65b757b745b9 (3) A2
  1260   |
  1246   |
  1261   | *  fdf9bde5129a (2) A1
  1247   | o  fdf9bde5129a (2) A1
  1262   |/
  1248   |/
  1263   x  471f378eab4c (1) A0
  1249   x  471f378eab4c (1) A0
  1264        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
  1250        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
  1265          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
  1251          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
  1266          --- a/changeset-description
  1252          --- a/changeset-description
  1281 Check that debugobshistory on the both diverged revision show a coherent
  1267 Check that debugobshistory on the both diverged revision show a coherent
  1282 graph
  1268 graph
  1283   $ hg obslog '65b757b745b9+fdf9bde5129a' --patch
  1269   $ hg obslog '65b757b745b9+fdf9bde5129a' --patch
  1284   @  65b757b745b9 (3) A2
  1270   @  65b757b745b9 (3) A2
  1285   |
  1271   |
  1286   | *  fdf9bde5129a (2) A1
  1272   | o  fdf9bde5129a (2) A1
  1287   |/
  1273   |/
  1288   x  471f378eab4c (1) A0
  1274   x  471f378eab4c (1) A0
  1289        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
  1275        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
  1290          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
  1276          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
  1291          --- a/changeset-description
  1277          --- a/changeset-description
  1358   $ hg update 471f378eab4c
  1344   $ hg update 471f378eab4c
  1359   abort: hidden revision '471f378eab4c'!
  1345   abort: hidden revision '471f378eab4c'!
  1360   (use --hidden to access hidden revisions; diverged)
  1346   (use --hidden to access hidden revisions; diverged)
  1361   [255]
  1347   [255]
  1362   $ hg update --hidden 'desc(A0)'
  1348   $ hg update --hidden 'desc(A0)'
  1363   updating to a hidden changeset 471f378eab4c
       
  1364   (hidden revision '471f378eab4c' has diverged)
       
  1365   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1349   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1366   working directory parent is obsolete! (471f378eab4c)
  1350   working directory parent is obsolete! (471f378eab4c)
  1367   (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
  1351   (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
  1368 
  1352 
  1369 Test output with amended + folded commit
  1353 Test output with amended + folded commit
  1589   $ hg update 471f378eab4c
  1573   $ hg update 471f378eab4c
  1590   abort: hidden revision '471f378eab4c'!
  1574   abort: hidden revision '471f378eab4c'!
  1591   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
  1575   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
  1592   [255]
  1576   [255]
  1593   $ hg update --hidden 'desc(A0)'
  1577   $ hg update --hidden 'desc(A0)'
  1594   updating to a hidden changeset 471f378eab4c
       
  1595   (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
       
  1596   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1578   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1597   working directory parent is obsolete! (471f378eab4c)
  1579   working directory parent is obsolete! (471f378eab4c)
  1598   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1580   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1599   $ hg update --hidden 0dec01379d3b
  1581   $ hg update --hidden 0dec01379d3b
  1600   updating to a hidden changeset 0dec01379d3b
       
  1601   (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
       
  1602   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1582   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1603   working directory parent is obsolete! (0dec01379d3b)
  1583   working directory parent is obsolete! (0dec01379d3b)
  1604   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1584   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1605   $ hg update 0dec01379d3b
  1585   $ hg update 0dec01379d3b
  1606   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1586   0 files updated, 0 files merged, 0 files removed, 0 files unresolved