1313 | |
1313 | |
1314 x c473644ee0e9 (2) B |
1314 x c473644ee0e9 (2) B |
1315 | rewritten by test (*20*) as a8df460dbbfe (glob) |
1315 | rewritten by test (*20*) as a8df460dbbfe (glob) |
1316 | |
1316 | |
1317 |
1317 |
|
1318 Test with multiple cyles |
|
1319 ======================== |
|
1320 |
|
1321 Test setup |
|
1322 ---------- |
|
1323 |
|
1324 $ hg init $TESTTMP/multiple-cycle |
|
1325 $ cd $TESTTMP/multiple-cycle |
|
1326 $ mkcommit ROOT |
|
1327 $ mkcommit A |
|
1328 $ mkcommit B |
|
1329 $ mkcommit C |
|
1330 $ mkcommit D |
|
1331 $ mkcommit E |
|
1332 $ mkcommit F |
|
1333 $ hg log -G |
|
1334 @ changeset: 6:d9f908fde1a1 |
|
1335 | tag: tip |
|
1336 | user: test |
|
1337 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1338 | summary: F |
|
1339 | |
|
1340 o changeset: 5:0da815c333f6 |
|
1341 | user: test |
|
1342 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1343 | summary: E |
|
1344 | |
|
1345 o changeset: 4:868d2e0eb19c |
|
1346 | user: test |
|
1347 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1348 | summary: D |
|
1349 | |
|
1350 o changeset: 3:a8df460dbbfe |
|
1351 | user: test |
|
1352 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1353 | summary: C |
|
1354 | |
|
1355 o changeset: 2:c473644ee0e9 |
|
1356 | user: test |
|
1357 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1358 | summary: B |
|
1359 | |
|
1360 o changeset: 1:2a34000d3544 |
|
1361 | user: test |
|
1362 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1363 | summary: A |
|
1364 | |
|
1365 o changeset: 0:ea207398892e |
|
1366 user: test |
|
1367 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1368 summary: ROOT |
|
1369 |
|
1370 Create a first cycle |
|
1371 $ hg prune -s "desc(B)" "desc(A)" |
|
1372 1 changesets pruned |
|
1373 5 new unstable changesets |
|
1374 $ hg prune -s "desc(C)" "desc(B)" |
|
1375 1 changesets pruned |
|
1376 $ hg prune --split -s "desc(A)" -s "desc(D)" "desc(C)" |
|
1377 1 changesets pruned |
|
1378 And create a second one |
|
1379 $ hg prune -s "desc(E)" "desc(D)" |
|
1380 1 changesets pruned |
|
1381 $ hg prune -s "desc(F)" "desc(E)" |
|
1382 1 changesets pruned |
|
1383 $ hg prune -s "desc(D)" "desc(F)" |
|
1384 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1385 working directory now at 868d2e0eb19c |
|
1386 1 changesets pruned |
|
1387 $ hg log --hidden -G |
|
1388 x changeset: 6:d9f908fde1a1 |
|
1389 | tag: tip |
|
1390 | user: test |
|
1391 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1392 | summary: F |
|
1393 | |
|
1394 x changeset: 5:0da815c333f6 |
|
1395 | user: test |
|
1396 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1397 | summary: E |
|
1398 | |
|
1399 @ changeset: 4:868d2e0eb19c |
|
1400 | user: test |
|
1401 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1402 | summary: D |
|
1403 | |
|
1404 x changeset: 3:a8df460dbbfe |
|
1405 | user: test |
|
1406 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1407 | summary: C |
|
1408 | |
|
1409 x changeset: 2:c473644ee0e9 |
|
1410 | user: test |
|
1411 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1412 | summary: B |
|
1413 | |
|
1414 x changeset: 1:2a34000d3544 |
|
1415 | user: test |
|
1416 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1417 | summary: A |
|
1418 | |
|
1419 o changeset: 0:ea207398892e |
|
1420 user: test |
|
1421 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1422 summary: ROOT |
|
1423 |
|
1424 Actual test |
|
1425 ----------- |
|
1426 |
|
1427 Check that debugobshistory never crash on a cycle |
|
1428 |
|
1429 $ hg debugobshistory "desc(D)" --hidden |
|
1430 x 0da815c333f6 (5) E |
|
1431 | rewritten by test (*20*) as d9f908fde1a1 (glob) |
|
1432 | |
|
1433 @ 868d2e0eb19c (4) D |
|
1434 |\ rewritten by test (*20*) as 0da815c333f6 (glob) |
|
1435 | | |
|
1436 | x d9f908fde1a1 (6) F |
|
1437 | | rewritten by test (*20*) as 868d2e0eb19c (glob) |
|
1438 | | |
|
1439 +---x 2a34000d3544 (1) A |
|
1440 | | rewritten by test (*20*) as c473644ee0e9 (glob) |
|
1441 | | |
|
1442 x | a8df460dbbfe (3) C |
|
1443 | | rewritten by test (*20*) as 2a34000d3544, 868d2e0eb19c (glob) |
|
1444 | | |
|
1445 x | c473644ee0e9 (2) B |
|
1446 | | rewritten by test (*20*) as a8df460dbbfe (glob) |
|
1447 | | |