Mercurial > evolve

comparison tests/test-evolve-templates.t @ 3411:e1f3e43a50a4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: backed out test output changes from core-1905aac253f0 This backs out evolve-ae6fddf39933
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 15 Jan 2018 19:52:00 +0100
parents 39112fd4d5ed
children 7d4347e1b1d5
comparison
equal deleted inserted replaced
3410:39112fd4d5ed 3411:e1f3e43a50a4
630 | user: test 630 | user: test
631 | date: Thu Jan 01 00:00:00 1970 +0000 631 | date: Thu Jan 01 00:00:00 1970 +0000
632 | instability: content-divergent 632 | instability: content-divergent
633 | summary: A2 633 | summary: A2
634 | 634 |
635 | * changeset: 2:fdf9bde5129a 635 | o changeset: 2:fdf9bde5129a
636 |/ parent: 0:ea207398892e 636 |/ parent: 0:ea207398892e
637 | user: test 637 | user: test
638 | date: Thu Jan 01 00:00:00 1970 +0000 638 | date: Thu Jan 01 00:00:00 1970 +0000
639 | instability: content-divergent 639 | instability: content-divergent
640 | summary: A1 640 | summary: A1
661 working directory parent is obsolete! (471f378eab4c) 661 working directory parent is obsolete! (471f378eab4c)
662 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 662 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
663 663
664 Precursors template should show current revision as it is the working copy 664 Precursors template should show current revision as it is the working copy
665 $ hg tlog 665 $ hg tlog
666 * 019fadeab383 666 o 019fadeab383
667 | Precursors: 1:471f378eab4c 667 | Precursors: 1:471f378eab4c
668 | semi-colon: 1:471f378eab4c 668 | semi-colon: 1:471f378eab4c
669 | * fdf9bde5129a 669 | o fdf9bde5129a
670 |/ Precursors: 1:471f378eab4c 670 |/ Precursors: 1:471f378eab4c
671 | semi-colon: 1:471f378eab4c 671 | semi-colon: 1:471f378eab4c
672 | @ 471f378eab4c 672 | @ 471f378eab4c
673 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 673 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
674 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 674 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383
676 | Fate: reworded using amend as 4:019fadeab383 676 | Fate: reworded using amend as 4:019fadeab383
677 | 677 |
678 o ea207398892e 678 o ea207398892e
679 679
680 $ hg fatelog 680 $ hg fatelog
681 * 019fadeab383 681 o 019fadeab383
682 | 682 |
683 | * fdf9bde5129a 683 | o fdf9bde5129a
684 |/ 684 |/
685 | @ 471f378eab4c 685 | @ 471f378eab4c
686 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383 686 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
687 | 687 |
688 o ea207398892e 688 o ea207398892e
691 $ hg up 'desc(A1)' 691 $ hg up 'desc(A1)'
692 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 692 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
693 Precursors template should not show precursors as it's not displayed in the 693 Precursors template should not show precursors as it's not displayed in the
694 log 694 log
695 $ hg tlog 695 $ hg tlog
696 * 019fadeab383 696 o 019fadeab383
697 | 697 |
698 | @ fdf9bde5129a 698 | @ fdf9bde5129a
699 |/ 699 |/
700 o ea207398892e 700 o ea207398892e
701 701
702 702
703 $ hg fatelog 703 $ hg fatelog
704 * 019fadeab383 704 o 019fadeab383
705 | 705 |
706 | @ fdf9bde5129a 706 | @ fdf9bde5129a
707 |/ 707 |/
708 o ea207398892e 708 o ea207398892e
709 709
710 Precursors template should a precursor as we force its display with --hidden 710 Precursors template should a precursor as we force its display with --hidden
711 $ hg tlog --hidden 711 $ hg tlog --hidden
712 * 019fadeab383 712 o 019fadeab383
713 | Precursors: 3:65b757b745b9 713 | Precursors: 3:65b757b745b9
714 | semi-colon: 3:65b757b745b9 714 | semi-colon: 3:65b757b745b9
715 | x 65b757b745b9 715 | x 65b757b745b9
716 |/ Precursors: 1:471f378eab4c 716 |/ Precursors: 1:471f378eab4c
717 | semi-colon: 1:471f378eab4c 717 | semi-colon: 1:471f378eab4c
729 | Fate: reworded using amend as 3:65b757b745b9 729 | Fate: reworded using amend as 3:65b757b745b9
730 | 730 |
731 o ea207398892e 731 o ea207398892e
732 732
733 $ hg fatelog --hidden 733 $ hg fatelog --hidden
734 * 019fadeab383 734 o 019fadeab383
735 | 735 |
736 | x 65b757b745b9 736 | x 65b757b745b9
737 |/ Obsfate: reworded using amend as 4:019fadeab383 737 |/ Obsfate: reworded using amend as 4:019fadeab383
738 | 738 |
739 | @ fdf9bde5129a 739 | @ fdf9bde5129a
743 | 743 |
744 o ea207398892e 744 o ea207398892e
745 745
746 746
747 $ hg fatelogjson --hidden 747 $ hg fatelogjson --hidden
748 * 019fadeab383 [] 748 o 019fadeab383 []
749 | 749 |
750 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] 750 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
751 |/ 751 |/
752 | @ fdf9bde5129a [] 752 | @ fdf9bde5129a []
753 |/ 753 |/
1374 | user: test 1374 | user: test
1375 | date: Thu Jan 01 00:00:00 1970 +0000 1375 | date: Thu Jan 01 00:00:00 1970 +0000
1376 | instability: content-divergent 1376 | instability: content-divergent
1377 | summary: Add B only 1377 | summary: Add B only
1378 | 1378 |
1379 | * changeset: 8:b18bc8331526 1379 | o changeset: 8:b18bc8331526
1380 |/ parent: 5:dd800401bd8c 1380 |/ parent: 5:dd800401bd8c
1381 | user: test 1381 | user: test
1382 | date: Thu Jan 01 00:00:00 1970 +0000 1382 | date: Thu Jan 01 00:00:00 1970 +0000
1383 | instability: content-divergent 1383 | instability: content-divergent
1384 | summary: Add only B 1384 | summary: Add only B
1385 | 1385 |
1386 | * changeset: 7:ba2ed02b0c9a 1386 | o changeset: 7:ba2ed02b0c9a
1387 | | user: test 1387 | | user: test
1388 | | date: Thu Jan 01 00:00:00 1970 +0000 1388 | | date: Thu Jan 01 00:00:00 1970 +0000
1389 | | instability: orphan, content-divergent 1389 | | instability: orphan, content-divergent
1390 | | summary: Add A,B,C 1390 | | summary: Add A,B,C
1391 | | 1391 | |
1394 | date: Thu Jan 01 00:00:00 1970 +0000 1394 | date: Thu Jan 01 00:00:00 1970 +0000
1395 | obsolete: reworded using amend as 8:b18bc8331526 1395 | obsolete: reworded using amend as 8:b18bc8331526
1396 | obsolete: reworded using amend as 9:0b997eb7ceee 1396 | obsolete: reworded using amend as 9:0b997eb7ceee
1397 | summary: Add A,B,C 1397 | summary: Add A,B,C
1398 | 1398 |
1399 * changeset: 5:dd800401bd8c 1399 o changeset: 5:dd800401bd8c
1400 | parent: 3:f897c6137566 1400 | parent: 3:f897c6137566
1401 | user: test 1401 | user: test
1402 | date: Thu Jan 01 00:00:00 1970 +0000 1402 | date: Thu Jan 01 00:00:00 1970 +0000
1403 | instability: content-divergent 1403 | instability: content-divergent
1404 | summary: Add A,B,C 1404 | summary: Add A,B,C
1419 1419
1420 $ hg tlog 1420 $ hg tlog
1421 @ 0b997eb7ceee 1421 @ 0b997eb7ceee
1422 | Precursors: 6:4a004186e638 1422 | Precursors: 6:4a004186e638
1423 | semi-colon: 6:4a004186e638 1423 | semi-colon: 6:4a004186e638
1424 | * b18bc8331526 1424 | o b18bc8331526
1425 |/ Precursors: 6:4a004186e638 1425 |/ Precursors: 6:4a004186e638
1426 | semi-colon: 6:4a004186e638 1426 | semi-colon: 6:4a004186e638
1427 | * ba2ed02b0c9a 1427 | o ba2ed02b0c9a
1428 | | 1428 | |
1429 | x 4a004186e638 1429 | x 4a004186e638
1430 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee 1430 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
1431 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee 1431 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
1432 | Fate: reworded using amend as 8:b18bc8331526 1432 | Fate: reworded using amend as 8:b18bc8331526
1433 | Fate: reworded using amend as 9:0b997eb7ceee 1433 | Fate: reworded using amend as 9:0b997eb7ceee
1434 | 1434 |
1435 * dd800401bd8c 1435 o dd800401bd8c
1436 | 1436 |
1437 o f897c6137566 1437 o f897c6137566
1438 | 1438 |
1439 o ea207398892e 1439 o ea207398892e
1440 1440
1441 $ hg fatelog 1441 $ hg fatelog
1442 @ 0b997eb7ceee 1442 @ 0b997eb7ceee
1443 | 1443 |
1444 | * b18bc8331526 1444 | o b18bc8331526
1445 |/ 1445 |/
1446 | * ba2ed02b0c9a 1446 | o ba2ed02b0c9a
1447 | | 1447 | |
1448 | x 4a004186e638 1448 | x 4a004186e638
1449 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee 1449 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
1450 | 1450 |
1451 * dd800401bd8c 1451 o dd800401bd8c
1452 | 1452 |
1453 o f897c6137566 1453 o f897c6137566
1454 | 1454 |
1455 o ea207398892e 1455 o ea207398892e
1456 1456
1457 $ hg tlog --hidden 1457 $ hg tlog --hidden
1458 @ 0b997eb7ceee 1458 @ 0b997eb7ceee
1459 | Precursors: 6:4a004186e638 1459 | Precursors: 6:4a004186e638
1460 | semi-colon: 6:4a004186e638 1460 | semi-colon: 6:4a004186e638
1461 | * b18bc8331526 1461 | o b18bc8331526
1462 |/ Precursors: 6:4a004186e638 1462 |/ Precursors: 6:4a004186e638
1463 | semi-colon: 6:4a004186e638 1463 | semi-colon: 6:4a004186e638
1464 | * ba2ed02b0c9a 1464 | o ba2ed02b0c9a
1465 | | Precursors: 4:9bd10a0775e4 1465 | | Precursors: 4:9bd10a0775e4
1466 | | semi-colon: 4:9bd10a0775e4 1466 | | semi-colon: 4:9bd10a0775e4
1467 | x 4a004186e638 1467 | x 4a004186e638
1468 |/ Precursors: 4:9bd10a0775e4 1468 |/ Precursors: 4:9bd10a0775e4
1469 | semi-colon: 4:9bd10a0775e4 1469 | semi-colon: 4:9bd10a0775e4
1470 | Successors: 8:b18bc8331526; 9:0b997eb7ceee 1470 | Successors: 8:b18bc8331526; 9:0b997eb7ceee
1471 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee 1471 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
1472 | Fate: reworded using amend as 8:b18bc8331526 1472 | Fate: reworded using amend as 8:b18bc8331526
1473 | Fate: reworded using amend as 9:0b997eb7ceee 1473 | Fate: reworded using amend as 9:0b997eb7ceee
1474 | 1474 |
1475 * dd800401bd8c 1475 o dd800401bd8c
1476 | Precursors: 4:9bd10a0775e4 1476 | Precursors: 4:9bd10a0775e4
1477 | semi-colon: 4:9bd10a0775e4 1477 | semi-colon: 4:9bd10a0775e4
1478 | x 9bd10a0775e4 1478 | x 9bd10a0775e4
1479 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a 1479 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1480 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a 1480 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1501 o ea207398892e 1501 o ea207398892e
1502 1502
1503 $ hg fatelog --hidden 1503 $ hg fatelog --hidden
1504 @ 0b997eb7ceee 1504 @ 0b997eb7ceee
1505 | 1505 |
1506 | * b18bc8331526 1506 | o b18bc8331526
1507 |/ 1507 |/
1508 | * ba2ed02b0c9a 1508 | o ba2ed02b0c9a
1509 | | 1509 | |
1510 | x 4a004186e638 1510 | x 4a004186e638
1511 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee 1511 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
1512 | 1512 |
1513 * dd800401bd8c 1513 o dd800401bd8c
1514 | 1514 |
1515 | x 9bd10a0775e4 1515 | x 9bd10a0775e4
1516 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a 1516 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
1517 | 1517 |
1518 o f897c6137566 1518 o f897c6137566
1531 working directory parent is obsolete! (9bd10a0775e4) 1531 working directory parent is obsolete! (9bd10a0775e4)
1532 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 1532 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
1533 $ hg rebase -r 7 -d 8 --config extensions.rebase= 1533 $ hg rebase -r 7 -d 8 --config extensions.rebase=
1534 rebasing 7:ba2ed02b0c9a "Add A,B,C" 1534 rebasing 7:ba2ed02b0c9a "Add A,B,C"
1535 $ hg tlog 1535 $ hg tlog
1536 * eceed8f98ffc 1536 o eceed8f98ffc
1537 | Precursors: 4:9bd10a0775e4 1537 | Precursors: 4:9bd10a0775e4
1538 | semi-colon: 4:9bd10a0775e4 1538 | semi-colon: 4:9bd10a0775e4
1539 | * 0b997eb7ceee 1539 | o 0b997eb7ceee
1540 | | Precursors: 4:9bd10a0775e4 1540 | | Precursors: 4:9bd10a0775e4
1541 | | semi-colon: 4:9bd10a0775e4 1541 | | semi-colon: 4:9bd10a0775e4
1542 * | b18bc8331526 1542 o | b18bc8331526
1543 |/ Precursors: 4:9bd10a0775e4 1543 |/ Precursors: 4:9bd10a0775e4
1544 | semi-colon: 4:9bd10a0775e4 1544 | semi-colon: 4:9bd10a0775e4
1545 * dd800401bd8c 1545 o dd800401bd8c
1546 | Precursors: 4:9bd10a0775e4 1546 | Precursors: 4:9bd10a0775e4
1547 | semi-colon: 4:9bd10a0775e4 1547 | semi-colon: 4:9bd10a0775e4
1548 | @ 9bd10a0775e4 1548 | @ 9bd10a0775e4
1549 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc 1549 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1550 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc 1550 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1554 o f897c6137566 1554 o f897c6137566
1555 | 1555 |
1556 o ea207398892e 1556 o ea207398892e
1557 1557
1558 $ hg fatelog 1558 $ hg fatelog
1559 * eceed8f98ffc 1559 o eceed8f98ffc
1560 | 1560 |
1561 | * 0b997eb7ceee 1561 | o 0b997eb7ceee
1562 | | 1562 | |
1563 * | b18bc8331526 1563 o | b18bc8331526
1564 |/ 1564 |/
1565 * dd800401bd8c 1565 o dd800401bd8c
1566 | 1566 |
1567 | @ 9bd10a0775e4 1567 | @ 9bd10a0775e4
1568 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc 1568 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
1569 | 1569 |
1570 o f897c6137566 1570 o f897c6137566