Mercurial > evolve
comparison tests/test-rewind.t @ 5803:abbc021c6f68
tests: add underlines to test-rewind.t
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 23 Feb 2021 18:34:07 +0800 |
| parents | 84efc2e92228 |
| children | fd039a7f0c3c |
comparison
equal
deleted
inserted
replaced
| 5802:84efc2e92228 | 5803:abbc021c6f68 |
|---|---|
| 1214 | 1214 |
| 1215 Extra cases related to folds | 1215 Extra cases related to folds |
| 1216 ============================ | 1216 ============================ |
| 1217 | 1217 |
| 1218 folding with a changeset created after the rewind target | 1218 folding with a changeset created after the rewind target |
| 1219 -------------------------------------------------------- | |
| 1219 | 1220 |
| 1220 .. B0 ⇠\ | 1221 .. B0 ⇠\ |
| 1221 .. | ⇠ AB2 | 1222 .. | ⇠ AB2 |
| 1222 .. A0 ⇠ A1 ⇠/ | 1223 .. A0 ⇠ A1 ⇠/ |
| 1223 | 1224 |
| 1266 [255] | 1267 [255] |
| 1267 | 1268 |
| 1268 $ cd .. | 1269 $ cd .. |
| 1269 | 1270 |
| 1270 folding with a changeset we rebased onto | 1271 folding with a changeset we rebased onto |
| 1272 ---------------------------------------- | |
| 1271 | 1273 |
| 1272 .. A0 ⇠ A1 ⇠\ | 1274 .. A0 ⇠ A1 ⇠\ |
| 1273 .. | ⇠ AB2 | 1275 .. | ⇠ AB2 |
| 1274 .. B0 ⇠/ | 1276 .. B0 ⇠/ |
| 1275 | 1277 |
| 1318 rewinding 1988e9fe9517 to 2 changesets: d6ed1d624918 7175ff74409b | 1320 rewinding 1988e9fe9517 to 2 changesets: d6ed1d624918 7175ff74409b |
| 1319 | 1321 |
| 1320 $ cd .. | 1322 $ cd .. |
| 1321 | 1323 |
| 1322 folding with a changeset that rebased on us | 1324 folding with a changeset that rebased on us |
| 1325 ------------------------------------------- | |
| 1323 | 1326 |
| 1324 .. B0 ⇠⇠⇠⇠ B1 ⇠\ | 1327 .. B0 ⇠⇠⇠⇠ B1 ⇠\ |
| 1325 .. | | ⇠ AB2 | 1328 .. | | ⇠ AB2 |
| 1326 .. | A0 ⇠ A1 ⇠/ | 1329 .. | A0 ⇠ A1 ⇠/ |
| 1327 | 1330 |
| 1429 fe7a7d317e168a15e8aa43131b54d3256443d728 e492d2f9be46b73c0cfa51709e92db864b8f3ed9 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'} | 1432 fe7a7d317e168a15e8aa43131b54d3256443d728 e492d2f9be46b73c0cfa51709e92db864b8f3ed9 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'} |
| 1430 | 1433 |
| 1431 $ cd .. | 1434 $ cd .. |
| 1432 | 1435 |
| 1433 simple fold with a missing part | 1436 simple fold with a missing part |
| 1437 ------------------------------- | |
| 1434 | 1438 |
| 1435 .. B0 ⇠ (B1) ⇠\ | 1439 .. B0 ⇠ (B1) ⇠\ |
| 1436 .. | | ⇠ AB2 | 1440 .. | | ⇠ AB2 |
| 1437 .. A0 ⇠ A1 ⇠/ | 1441 .. A0 ⇠ A1 ⇠/ |
| 1438 | 1442 |
| 1543 [255] | 1547 [255] |
| 1544 | 1548 |
| 1545 $ cd .. | 1549 $ cd .. |
| 1546 | 1550 |
| 1547 split and then fold with a missing part | 1551 split and then fold with a missing part |
| 1552 --------------------------------------- | |
| 1548 | 1553 |
| 1549 .. /⇠ (C1) ⇠\ | 1554 .. /⇠ (C1) ⇠\ |
| 1550 .. BC0 ⇠ | \ | 1555 .. BC0 ⇠ | \ |
| 1551 .. | \⇠ B1 ⇠ AC2 | 1556 .. | \⇠ B1 ⇠ AC2 |
| 1552 .. A0 ⇠⇠⇠⇠⇠⇠⇠⇠⇠⇠⇠/ | 1557 .. A0 ⇠⇠⇠⇠⇠⇠⇠⇠⇠⇠⇠/ |