Mercurial > evolve

comparison tests/test-evolve-templates.t @ 6929:972d98ce3552 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: unrelated parts of splits are no longer considered content-divergent Let's backport e68fe567a780 from core that improves content-divergence computation. This way we can both provide a better experience to evolve extension users on older Mercurial versions, and don't have to fix evolve tests for hg 6.1 that we use for one of our CI jobs.
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 06 Nov 2024 16:45:02 +0400
parents 5e14782908e4
children
comparison
equal deleted inserted replaced
6927:85b1b169dfba 6929:972d98ce3552
1422 $ hg up 6 --hidden 1422 $ hg up 6 --hidden
1423 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1423 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1424 working directory parent is obsolete! (4a004186e638) 1424 working directory parent is obsolete! (4a004186e638)
1425 (use 'hg evolve' to update to its successor: b18bc8331526) 1425 (use 'hg evolve' to update to its successor: b18bc8331526)
1426 $ hg commit --amend -m "Add B only" 1426 $ hg commit --amend -m "Add B only"
1427 4 new content-divergent changesets 1427 2 new content-divergent changesets
1428 1428
1429 $ hg log -G 1429 $ hg log -G
1430 @ changeset: 9:0b997eb7ceee 1430 @ changeset: 9:0b997eb7ceee
1431 | tag: tip 1431 | tag: tip
1432 | parent: 5:dd800401bd8c 1432 | parent: 5:dd800401bd8c
1443 | summary: Add only B 1443 | summary: Add only B
1444 | 1444 |
1445 | * changeset: 7:ba2ed02b0c9a 1445 | * changeset: 7:ba2ed02b0c9a
1446 | | user: test 1446 | | user: test
1447 | | date: Thu Jan 01 00:00:00 1970 +0000 1447 | | date: Thu Jan 01 00:00:00 1970 +0000
1448 | | instability: orphan, content-divergent 1448 | | instability: orphan
1449 | | summary: Add A,B,C 1449 | | summary: Add A,B,C
1450 | | 1450 | |
1451 | x changeset: 6:4a004186e638 1451 | x changeset: 6:4a004186e638
1452 |/ user: test 1452 |/ user: test
1453 | date: Thu Jan 01 00:00:00 1970 +0000 1453 | date: Thu Jan 01 00:00:00 1970 +0000
1454 | obsolete: reworded using amend as 8:b18bc8331526 1454 | obsolete: reworded using amend as 8:b18bc8331526
1455 | obsolete: reworded using amend as 9:0b997eb7ceee 1455 | obsolete: reworded using amend as 9:0b997eb7ceee
1456 | summary: Add A,B,C 1456 | summary: Add A,B,C
1457 | 1457 |
1458 * changeset: 5:dd800401bd8c 1458 o changeset: 5:dd800401bd8c
1459 | parent: 3:f897c6137566 1459 | parent: 3:f897c6137566
1460 | user: test 1460 | user: test
1461 | date: Thu Jan 01 00:00:00 1970 +0000 1461 | date: Thu Jan 01 00:00:00 1970 +0000
1462 | instability: content-divergent
1463 | summary: Add A,B,C 1462 | summary: Add A,B,C
1464 | 1463 |
1465 o changeset: 3:f897c6137566 1464 o changeset: 3:f897c6137566
1466 | parent: 0:ea207398892e 1465 | parent: 0:ea207398892e
1467 | user: test 1466 | user: test
1493 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee 1492 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
1494 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee 1493 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
1495 | Fate: reworded using amend as 8:b18bc8331526 1494 | Fate: reworded using amend as 8:b18bc8331526
1496 | Fate: reworded using amend as 9:0b997eb7ceee 1495 | Fate: reworded using amend as 9:0b997eb7ceee
1497 | 1496 |
1498 * dd800401bd8c 1497 o dd800401bd8c
1499 | 1498 |
1500 o f897c6137566 1499 o f897c6137566
1501 | 1500 |
1502 o ea207398892e 1501 o ea207398892e
1503 1502
1511 | * ba2ed02b0c9a 1510 | * ba2ed02b0c9a
1512 | | 1511 | |
1513 | x 4a004186e638 1512 | x 4a004186e638
1514 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee 1513 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
1515 | 1514 |
1516 * dd800401bd8c 1515 o dd800401bd8c
1517 | 1516 |
1518 o f897c6137566 1517 o f897c6137566
1519 | 1518 |
1520 o ea207398892e 1519 o ea207398892e
1521 1520
1542 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee 1541 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
1543 | Fate: reworded using amend as 8:b18bc8331526 1542 | Fate: reworded using amend as 8:b18bc8331526
1544 | Fate: reworded using amend as 9:0b997eb7ceee 1543 | Fate: reworded using amend as 9:0b997eb7ceee
1545 | Origin: split from 4:9bd10a0775e4 1544 | Origin: split from 4:9bd10a0775e4
1546 | 1545 |
1547 * dd800401bd8c 1546 o dd800401bd8c
1548 | Predecessors: 4:9bd10a0775e4 1547 | Predecessors: 4:9bd10a0775e4
1549 | semi-colon: 4:9bd10a0775e4 1548 | semi-colon: 4:9bd10a0775e4
1550 | Origin: split from 4:9bd10a0775e4 1549 | Origin: split from 4:9bd10a0775e4
1551 | 1550 |
1552 | x 9bd10a0775e4 1551 | x 9bd10a0775e4
1590 | | 1589 | |
1591 | x 4a004186e638 1590 | x 4a004186e638
1592 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee 1591 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
1593 | Obsorigin: split from 4:9bd10a0775e4 1592 | Obsorigin: split from 4:9bd10a0775e4
1594 | 1593 |
1595 * dd800401bd8c 1594 o dd800401bd8c
1596 | Obsorigin: split from 4:9bd10a0775e4 1595 | Obsorigin: split from 4:9bd10a0775e4
1597 | 1596 |
1598 | x 9bd10a0775e4 1597 | x 9bd10a0775e4
1599 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a 1598 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
1600 | 1599 |
1618 working directory parent is obsolete! (9bd10a0775e4) 1617 working directory parent is obsolete! (9bd10a0775e4)
1619 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 1618 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
1620 $ hg rebase -r 7 -d 8 --config extensions.rebase= 1619 $ hg rebase -r 7 -d 8 --config extensions.rebase=
1621 rebasing 7:ba2ed02b0c9a "Add A,B,C" 1620 rebasing 7:ba2ed02b0c9a "Add A,B,C"
1622 $ hg tlog 1621 $ hg tlog
1623 * eceed8f98ffc 1622 o eceed8f98ffc
1624 | Predecessors: 4:9bd10a0775e4 1623 | Predecessors: 4:9bd10a0775e4
1625 | semi-colon: 4:9bd10a0775e4 1624 | semi-colon: 4:9bd10a0775e4
1626 | Origin: rewritten using rebase from 4:9bd10a0775e4 1625 | Origin: rewritten using rebase from 4:9bd10a0775e4
1627 | 1626 |
1628 | * 0b997eb7ceee 1627 | * 0b997eb7ceee
1633 * | b18bc8331526 1632 * | b18bc8331526
1634 |/ Predecessors: 4:9bd10a0775e4 1633 |/ Predecessors: 4:9bd10a0775e4
1635 | semi-colon: 4:9bd10a0775e4 1634 | semi-colon: 4:9bd10a0775e4
1636 | Origin: rewritten using amend from 4:9bd10a0775e4 1635 | Origin: rewritten using amend from 4:9bd10a0775e4
1637 | 1636 |
1638 * dd800401bd8c 1637 o dd800401bd8c
1639 | Predecessors: 4:9bd10a0775e4 1638 | Predecessors: 4:9bd10a0775e4
1640 | semi-colon: 4:9bd10a0775e4 1639 | semi-colon: 4:9bd10a0775e4
1641 | Origin: split from 4:9bd10a0775e4 1640 | Origin: split from 4:9bd10a0775e4
1642 | 1641 |
1643 | @ 9bd10a0775e4 1642 | @ 9bd10a0775e4
1649 o f897c6137566 1648 o f897c6137566
1650 | 1649 |
1651 o ea207398892e 1650 o ea207398892e
1652 1651
1653 $ hg fateoriginlog 1652 $ hg fateoriginlog
1654 * eceed8f98ffc 1653 o eceed8f98ffc
1655 | Obsorigin: rewritten using rebase from 4:9bd10a0775e4 1654 | Obsorigin: rewritten using rebase from 4:9bd10a0775e4
1656 | 1655 |
1657 | * 0b997eb7ceee 1656 | * 0b997eb7ceee
1658 | | Obsorigin: rewritten using amend from 4:9bd10a0775e4 1657 | | Obsorigin: rewritten using amend from 4:9bd10a0775e4
1659 | | 1658 | |
1660 * | b18bc8331526 1659 * | b18bc8331526
1661 |/ Obsorigin: rewritten using amend from 4:9bd10a0775e4 1660 |/ Obsorigin: rewritten using amend from 4:9bd10a0775e4
1662 | 1661 |
1663 * dd800401bd8c 1662 o dd800401bd8c
1664 | Obsorigin: split from 4:9bd10a0775e4 1663 | Obsorigin: split from 4:9bd10a0775e4
1665 | 1664 |
1666 | @ 9bd10a0775e4 1665 | @ 9bd10a0775e4
1667 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc 1666 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
1668 | 1667 |