1118 | |
1118 | |
1119 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] (glob) |
1119 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] (glob) |
1120 |/ |
1120 |/ |
1121 o ea207398892e [] |
1121 o ea207398892e [] |
1122 |
1122 |
1123 |
1123 |
|
1124 Test template with obsmarkers cycle |
|
1125 =================================== |
|
1126 |
|
1127 Test setup |
|
1128 ---------- |
|
1129 |
|
1130 $ hg init $TESTTMP/templates-local-cycle |
|
1131 $ cd $TESTTMP/templates-local-cycle |
|
1132 $ mkcommit ROOT |
|
1133 $ mkcommit A0 |
|
1134 $ mkcommit B0 |
|
1135 $ hg up -r 0 |
|
1136 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1137 $ mkcommit C0 |
|
1138 created new head |
|
1139 |
|
1140 Create the cycle |
|
1141 |
|
1142 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
|
1143 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
1144 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
|
1145 |
|
1146 Check templates |
|
1147 --------------- |
|
1148 |
|
1149 $ hg tlog |
|
1150 @ f897c6137566 |
|
1151 | |
|
1152 o ea207398892e |
|
1153 |
|
1154 $ hg fatelog |
|
1155 @ f897c6137566 |
|
1156 | |
|
1157 o ea207398892e |
|
1158 |
|
1159 $ hg up -r "desc(B0)" --hidden |
|
1160 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1161 working directory parent is obsolete! (0dec01379d3b) |
|
1162 (use 'hg evolve' to update to its parent successor) |
|
1163 $ hg tlog |
|
1164 o f897c6137566 |
|
1165 | Precursors: 0dec01379d3b |
|
1166 | semi-colon: 0dec01379d3b |
|
1167 | @ 0dec01379d3b |
|
1168 | | Precursors: 471f378eab4c |
|
1169 | | semi-colon: 471f378eab4c |
|
1170 | | Successors: [f897c6137566], [471f378eab4c] |
|
1171 | | semi-colon: [f897c6137566]; [471f378eab4c] |
|
1172 | | Fate: rewritten as f897c6137566 |
|
1173 | | Fate: rewritten as 471f378eab4c |
|
1174 | | |
|
1175 | x 471f378eab4c |
|
1176 |/ Precursors: 0dec01379d3b |
|
1177 | semi-colon: 0dec01379d3b |
|
1178 | Successors: [0dec01379d3b] |
|
1179 | semi-colon: [0dec01379d3b] |
|
1180 | Fate: rewritten as 0dec01379d3b |
|
1181 | |
|
1182 o ea207398892e |
|
1183 |
|
1184 $ hg fatelog |
|
1185 o f897c6137566 |
|
1186 | |
|
1187 | @ 0dec01379d3b |
|
1188 | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c |
|
1189 | | |
|
1190 | x 471f378eab4c |
|
1191 |/ Obsfate: rewritten as 0dec01379d3b |
|
1192 | |
|
1193 o ea207398892e |
|
1194 |
|
1195 $ hg up -r "desc(A0)" --hidden |
|
1196 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1197 working directory parent is obsolete! (471f378eab4c) |
|
1198 (use 'hg evolve' to update to its parent successor) |
|
1199 $ hg tlog |
|
1200 o f897c6137566 |
|
1201 | Precursors: 471f378eab4c |
|
1202 | semi-colon: 471f378eab4c |
|
1203 | @ 471f378eab4c |
|
1204 |/ Fate: pruned |
|
1205 | |
|
1206 o ea207398892e |
|
1207 |
|
1208 $ hg fatelog |
|
1209 o f897c6137566 |
|
1210 | |
|
1211 | @ 471f378eab4c |
|
1212 |/ Obsfate: pruned |
|
1213 | |
|
1214 o ea207398892e |
|
1215 |
|
1216 |
|
1217 $ hg up -r "desc(ROOT)" --hidden |
|
1218 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1219 $ hg tlog |
|
1220 o f897c6137566 |
|
1221 | |
|
1222 @ ea207398892e |
|
1223 |
|
1224 $ hg fatelog |
|
1225 o f897c6137566 |
|
1226 | |
|
1227 @ ea207398892e |
|
1228 |
|
1229 $ hg tlog --hidden |
|
1230 o f897c6137566 |
|
1231 | Precursors: 0dec01379d3b |
|
1232 | semi-colon: 0dec01379d3b |
|
1233 | x 0dec01379d3b |
|
1234 | | Precursors: 471f378eab4c |
|
1235 | | semi-colon: 471f378eab4c |
|
1236 | | Successors: [f897c6137566], [471f378eab4c] |
|
1237 | | semi-colon: [f897c6137566]; [471f378eab4c] |
|
1238 | | Fate: rewritten as f897c6137566 |
|
1239 | | Fate: rewritten as 471f378eab4c |
|
1240 | | |
|
1241 | x 471f378eab4c |
|
1242 |/ Precursors: 0dec01379d3b |
|
1243 | semi-colon: 0dec01379d3b |
|
1244 | Successors: [0dec01379d3b] |
|
1245 | semi-colon: [0dec01379d3b] |
|
1246 | Fate: rewritten as 0dec01379d3b |
|
1247 | |
|
1248 @ ea207398892e |
|
1249 |
|
1250 Test template with split + divergence with cycles |
|
1251 ================================================= |
|
1252 |
|
1253 $ hg log -G |
|
1254 o changeset: 3:f897c6137566 |
|
1255 | tag: tip |
|
1256 | parent: 0:ea207398892e |
|
1257 | user: test |
|
1258 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1259 | summary: C0 |
|
1260 | |
|
1261 @ changeset: 0:ea207398892e |
|
1262 user: test |
|
1263 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1264 summary: ROOT |
|
1265 |
|
1266 $ hg up |
|
1267 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1268 |
|
1269 Create a commit with three files |
|
1270 $ touch A B C |
|
1271 $ hg commit -A -m "Add A,B,C" A B C |
|
1272 |
|
1273 Split it |
|
1274 $ hg up 3 |
|
1275 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
1276 $ touch A |
|
1277 $ hg commit -A -m "Add A,B,C" A |
|
1278 created new head |
|
1279 |
|
1280 $ touch B |
|
1281 $ hg commit -A -m "Add A,B,C" B |
|
1282 |
|
1283 $ touch C |
|
1284 $ hg commit -A -m "Add A,B,C" C |
|
1285 |
|
1286 $ hg log -G |
|
1287 @ changeset: 7:ba2ed02b0c9a |
|
1288 | tag: tip |
|
1289 | user: test |
|
1290 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1291 | summary: Add A,B,C |
|
1292 | |
|
1293 o changeset: 6:4a004186e638 |
|
1294 | user: test |
|
1295 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1296 | summary: Add A,B,C |
|
1297 | |
|
1298 o changeset: 5:dd800401bd8c |
|
1299 | parent: 3:f897c6137566 |
|
1300 | user: test |
|
1301 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1302 | summary: Add A,B,C |
|
1303 | |
|
1304 | o changeset: 4:9bd10a0775e4 |
|
1305 |/ user: test |
|
1306 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1307 | summary: Add A,B,C |
|
1308 | |
|
1309 o changeset: 3:f897c6137566 |
|
1310 | parent: 0:ea207398892e |
|
1311 | user: test |
|
1312 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1313 | summary: C0 |
|
1314 | |
|
1315 o changeset: 0:ea207398892e |
|
1316 user: test |
|
1317 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1318 summary: ROOT |
|
1319 |
|
1320 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` |
|
1321 $ hg log -G |
|
1322 @ changeset: 7:ba2ed02b0c9a |
|
1323 | tag: tip |
|
1324 | user: test |
|
1325 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1326 | summary: Add A,B,C |
|
1327 | |
|
1328 o changeset: 6:4a004186e638 |
|
1329 | user: test |
|
1330 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1331 | summary: Add A,B,C |
|
1332 | |
|
1333 o changeset: 5:dd800401bd8c |
|
1334 | parent: 3:f897c6137566 |
|
1335 | user: test |
|
1336 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1337 | summary: Add A,B,C |
|
1338 | |
|
1339 o changeset: 3:f897c6137566 |
|
1340 | parent: 0:ea207398892e |
|
1341 | user: test |
|
1342 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1343 | summary: C0 |
|
1344 | |
|
1345 o changeset: 0:ea207398892e |
|
1346 user: test |
|
1347 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1348 summary: ROOT |
|
1349 |
|
1350 Diverge one of the splitted commit |
|
1351 |
|
1352 $ hg up 6 |
|
1353 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1354 $ hg commit --amend -m "Add only B" |
|
1355 1 new unstable changesets |
|
1356 |
|
1357 $ hg up 6 --hidden |
|
1358 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1359 working directory parent is obsolete! (4a004186e638) |
|
1360 (use 'hg evolve' to update to its successor: b18bc8331526) |
|
1361 $ hg commit --amend -m "Add B only" |
|
1362 4 new divergent changesets |
|
1363 |
|
1364 $ hg log -G |
|
1365 @ changeset: 9:0b997eb7ceee |
|
1366 | tag: tip |
|
1367 | parent: 5:dd800401bd8c |
|
1368 | user: test |
|
1369 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1370 | trouble: divergent |
|
1371 | summary: Add B only |
|
1372 | |
|
1373 | o changeset: 8:b18bc8331526 |
|
1374 |/ parent: 5:dd800401bd8c |
|
1375 | user: test |
|
1376 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1377 | trouble: divergent |
|
1378 | summary: Add only B |
|
1379 | |
|
1380 | o changeset: 7:ba2ed02b0c9a |
|
1381 | | user: test |
|
1382 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1383 | | trouble: unstable, divergent |
|
1384 | | summary: Add A,B,C |
|
1385 | | |
|
1386 | x changeset: 6:4a004186e638 |
|
1387 |/ user: test |
|
1388 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1389 | summary: Add A,B,C |
|
1390 | |
|
1391 o changeset: 5:dd800401bd8c |
|
1392 | parent: 3:f897c6137566 |
|
1393 | user: test |
|
1394 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1395 | trouble: divergent |
|
1396 | summary: Add A,B,C |
|
1397 | |
|
1398 o changeset: 3:f897c6137566 |
|
1399 | parent: 0:ea207398892e |
|
1400 | user: test |
|
1401 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1402 | summary: C0 |
|
1403 | |
|
1404 o changeset: 0:ea207398892e |
|
1405 user: test |
|
1406 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1407 summary: ROOT |
|
1408 |
|
1409 Check templates |
|
1410 --------------- |
|
1411 |
|
1412 $ hg tlog |
|
1413 @ 0b997eb7ceee |
|
1414 | Precursors: 4a004186e638 |
|
1415 | semi-colon: 4a004186e638 |
|
1416 | o b18bc8331526 |
|
1417 |/ Precursors: 4a004186e638 |
|
1418 | semi-colon: 4a004186e638 |
|
1419 | o ba2ed02b0c9a |
|
1420 | | |
|
1421 | x 4a004186e638 |
|
1422 |/ Successors: [b18bc8331526], [0b997eb7ceee] |
|
1423 | semi-colon: [b18bc8331526]; [0b997eb7ceee] |
|
1424 | Fate: reworded as b18bc8331526 |
|
1425 | Fate: reworded as 0b997eb7ceee |
|
1426 | |
|
1427 o dd800401bd8c |
|
1428 | |
|
1429 o f897c6137566 |
|
1430 | |
|
1431 o ea207398892e |
|
1432 |
|
1433 $ hg fatelog |
|
1434 @ 0b997eb7ceee |
|
1435 | |
|
1436 | o b18bc8331526 |
|
1437 |/ |
|
1438 | o ba2ed02b0c9a |
|
1439 | | |
|
1440 | x 4a004186e638 |
|
1441 |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee |
|
1442 | |
|
1443 o dd800401bd8c |
|
1444 | |
|
1445 o f897c6137566 |
|
1446 | |
|
1447 o ea207398892e |
|
1448 |
|
1449 $ hg tlog --hidden |
|
1450 @ 0b997eb7ceee |
|
1451 | Precursors: 4a004186e638 |
|
1452 | semi-colon: 4a004186e638 |
|
1453 | o b18bc8331526 |
|
1454 |/ Precursors: 4a004186e638 |
|
1455 | semi-colon: 4a004186e638 |
|
1456 | o ba2ed02b0c9a |
|
1457 | | Precursors: 9bd10a0775e4 |
|
1458 | | semi-colon: 9bd10a0775e4 |
|
1459 | x 4a004186e638 |
|
1460 |/ Precursors: 9bd10a0775e4 |
|
1461 | semi-colon: 9bd10a0775e4 |
|
1462 | Successors: [b18bc8331526], [0b997eb7ceee] |
|
1463 | semi-colon: [b18bc8331526]; [0b997eb7ceee] |
|
1464 | Fate: reworded as b18bc8331526 |
|
1465 | Fate: reworded as 0b997eb7ceee |
|
1466 | |
|
1467 o dd800401bd8c |
|
1468 | Precursors: 9bd10a0775e4 |
|
1469 | semi-colon: 9bd10a0775e4 |
|
1470 | x 9bd10a0775e4 |
|
1471 |/ Successors: [dd800401bd8c, 4a004186e638, ba2ed02b0c9a] |
|
1472 | semi-colon: [dd800401bd8c, 4a004186e638, ba2ed02b0c9a] |
|
1473 | Fate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c |
|
1474 | |
|
1475 o f897c6137566 |
|
1476 | Precursors: 0dec01379d3b |
|
1477 | semi-colon: 0dec01379d3b |
|
1478 | x 0dec01379d3b |
|
1479 | | Precursors: 471f378eab4c |
|
1480 | | semi-colon: 471f378eab4c |
|
1481 | | Successors: [f897c6137566], [471f378eab4c] |
|
1482 | | semi-colon: [f897c6137566]; [471f378eab4c] |
|
1483 | | Fate: rewritten as f897c6137566 |
|
1484 | | Fate: rewritten as 471f378eab4c |
|
1485 | | |
|
1486 | x 471f378eab4c |
|
1487 |/ Precursors: 0dec01379d3b |
|
1488 | semi-colon: 0dec01379d3b |
|
1489 | Successors: [0dec01379d3b] |
|
1490 | semi-colon: [0dec01379d3b] |
|
1491 | Fate: rewritten as 0dec01379d3b |
|
1492 | |
|
1493 o ea207398892e |
|
1494 |
|
1495 $ hg fatelog --hidden |
|
1496 @ 0b997eb7ceee |
|
1497 | |
|
1498 | o b18bc8331526 |
|
1499 |/ |
|
1500 | o ba2ed02b0c9a |
|
1501 | | |
|
1502 | x 4a004186e638 |
|
1503 |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee |
|
1504 | |
|
1505 o dd800401bd8c |
|
1506 | |
|
1507 | x 9bd10a0775e4 |
|
1508 |/ Obsfate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c |
|
1509 | |
|
1510 o f897c6137566 |
|
1511 | |
|
1512 | x 0dec01379d3b |
|
1513 | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c |
|
1514 | | |
|
1515 | x 471f378eab4c |
|
1516 |/ Obsfate: rewritten as 0dec01379d3b |
|
1517 | |
|
1518 o ea207398892e |
|
1519 |
|
1520 $ hg up --hidden 4 |
|
1521 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1522 working directory parent is obsolete! (9bd10a0775e4) |
|
1523 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
|
1524 $ hg rebase -r 7 -d 8 --config extensions.rebase= |
|
1525 rebasing 7:ba2ed02b0c9a "Add A,B,C" |
|
1526 $ hg tlog |
|
1527 o eceed8f98ffc |
|
1528 | Precursors: 9bd10a0775e4 |
|
1529 | semi-colon: 9bd10a0775e4 |
|
1530 | o 0b997eb7ceee |
|
1531 | | Precursors: 9bd10a0775e4 |
|
1532 | | semi-colon: 9bd10a0775e4 |
|
1533 o | b18bc8331526 |
|
1534 |/ Precursors: 9bd10a0775e4 |
|
1535 | semi-colon: 9bd10a0775e4 |
|
1536 o dd800401bd8c |
|
1537 | Precursors: 9bd10a0775e4 |
|
1538 | semi-colon: 9bd10a0775e4 |
|
1539 | @ 9bd10a0775e4 |
|
1540 |/ Successors: [dd800401bd8c, 0b997eb7ceee, eceed8f98ffc], [dd800401bd8c, b18bc8331526, eceed8f98ffc] |
|
1541 | semi-colon: [dd800401bd8c, 0b997eb7ceee, eceed8f98ffc]; [dd800401bd8c, b18bc8331526, eceed8f98ffc] |
|
1542 | Fate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc |
|
1543 | Fate: split as b18bc8331526, dd800401bd8c, eceed8f98ffc |
|
1544 | |
|
1545 o f897c6137566 |
|
1546 | |
|
1547 o ea207398892e |
|
1548 |
|
1549 $ hg fatelog |
|
1550 o eceed8f98ffc |
|
1551 | |
|
1552 | o 0b997eb7ceee |
|
1553 | | |
|
1554 o | b18bc8331526 |
|
1555 |/ |
|
1556 o dd800401bd8c |
|
1557 | |
|
1558 | @ 9bd10a0775e4 |
|
1559 |/ Obsfate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc; split as b18bc8331526, dd800401bd8c, eceed8f98ffc |
|
1560 | |
|
1561 o f897c6137566 |
|
1562 | |
|
1563 o ea207398892e |
|
1564 |
1124 Test templates with pruned commits |
1565 Test templates with pruned commits |
1125 ================================== |
1566 ================================== |
1126 |
1567 |
1127 Test setup |
1568 Test setup |
1128 ---------- |
1569 ---------- |