Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 4822:e50596ff2ddb stable
tests: demonstrate too many spaces in olog -p output with word-diff
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 30 Aug 2019 11:28:02 +0700 |
| parents | b6c819facbe8 |
| children | c16fed4908d8 |
comparison
equal
deleted
inserted
replaced
| 4813:dd68ce259708 | 4822:e50596ff2ddb |
|---|---|
| 1410 change made by the public predecessors. The cancellation of these changes need | 1410 change made by the public predecessors. The cancellation of these changes need |
| 1411 to be preserved. | 1411 to be preserved. |
| 1412 | 1412 |
| 1413 $ hg init cancelled-changes | 1413 $ hg init cancelled-changes |
| 1414 $ cd cancelled-changes | 1414 $ cd cancelled-changes |
| 1415 $ cat << EOF > .hg/hgrc | |
| 1416 > [diff] | |
| 1417 > word-diff = yes | |
| 1418 > EOF | |
| 1415 $ cat << EOF > numbers | 1419 $ cat << EOF > numbers |
| 1416 > 1 | 1420 > 1 |
| 1417 > 2 | 1421 > 2 |
| 1418 > 3 | 1422 > 3 |
| 1419 > 4 | 1423 > 4 |
| 1592 +++ b/letters Thu Jan 01 00:00:00 1970 +0000 | 1596 +++ b/letters Thu Jan 01 00:00:00 1970 +0000 |
| 1593 @@ -1,7 +1,7 @@ | 1597 @@ -1,7 +1,7 @@ |
| 1594 a | 1598 a |
| 1595 b | 1599 b |
| 1596 c | 1600 c |
| 1597 -D | 1601 - D |
| 1598 +d | 1602 + d |
| 1599 e | 1603 e |
| 1600 f | 1604 f |
| 1601 g | 1605 g |
| 1602 diff -r 3074c7249d20 -r 599454370881 numbers | 1606 diff -r 3074c7249d20 -r 599454370881 numbers |
| 1603 --- a/numbers Thu Jan 01 00:00:00 1970 +0000 | 1607 --- a/numbers Thu Jan 01 00:00:00 1970 +0000 |
| 1604 +++ b/numbers Thu Jan 01 00:00:00 1970 +0000 | 1608 +++ b/numbers Thu Jan 01 00:00:00 1970 +0000 |
| 1605 @@ -1,9 +1,9 @@ | 1609 @@ -1,9 +1,9 @@ |
| 1606 1 | 1610 1 |
| 1607 2 | 1611 2 |
| 1608 3 | 1612 3 |
| 1609 -four | 1613 - four |
| 1610 +4 | 1614 + 4 |
| 1611 5 | 1615 5 |
| 1612 6 | 1616 6 |
| 1613 -7 | 1617 - 7 |
| 1614 +seven | 1618 + seven |
| 1615 8 | 1619 8 |
| 1616 nine | 1620 nine |
| 1617 diff -r 3074c7249d20 -r 599454370881 romans | 1621 diff -r 3074c7249d20 -r 599454370881 romans |
| 1618 --- a/romans Thu Jan 01 00:00:00 1970 +0000 | 1622 --- a/romans Thu Jan 01 00:00:00 1970 +0000 |
| 1619 +++ b/romans Thu Jan 01 00:00:00 1970 +0000 | 1623 +++ b/romans Thu Jan 01 00:00:00 1970 +0000 |
| 1620 @@ -1,5 +1,5 @@ | 1624 @@ -1,5 +1,5 @@ |
| 1621 I | 1625 I |
| 1622 -II | 1626 - II |
| 1623 +ii | 1627 + ii |
| 1624 III | 1628 III |
| 1625 IV | 1629 IV |
| 1626 V | 1630 V |
| 1627 | 1631 |
| 1628 | 1632 |
| 1780 +++ b/letters Thu Jan 01 00:00:00 1970 +0000 | 1784 +++ b/letters Thu Jan 01 00:00:00 1970 +0000 |
| 1781 @@ -1,7 +1,7 @@ | 1785 @@ -1,7 +1,7 @@ |
| 1782 a | 1786 a |
| 1783 b | 1787 b |
| 1784 c | 1788 c |
| 1785 -D | 1789 - D |
| 1786 +d | 1790 + d |
| 1787 e | 1791 e |
| 1788 f | 1792 f |
| 1789 g | 1793 g |
| 1790 diff -r 3074c7249d20 -r 599454370881 numbers | 1794 diff -r 3074c7249d20 -r 599454370881 numbers |
| 1791 --- a/numbers Thu Jan 01 00:00:00 1970 +0000 | 1795 --- a/numbers Thu Jan 01 00:00:00 1970 +0000 |
| 1792 +++ b/numbers Thu Jan 01 00:00:00 1970 +0000 | 1796 +++ b/numbers Thu Jan 01 00:00:00 1970 +0000 |
| 1793 @@ -1,9 +1,9 @@ | 1797 @@ -1,9 +1,9 @@ |
| 1794 1 | 1798 1 |
| 1795 2 | 1799 2 |
| 1796 3 | 1800 3 |
| 1797 -four | 1801 - four |
| 1798 +4 | 1802 + 4 |
| 1799 5 | 1803 5 |
| 1800 6 | 1804 6 |
| 1801 -7 | 1805 - 7 |
| 1802 +seven | 1806 + seven |
| 1803 8 | 1807 8 |
| 1804 nine | 1808 nine |
| 1805 diff -r 3074c7249d20 -r 599454370881 romans | 1809 diff -r 3074c7249d20 -r 599454370881 romans |
| 1806 --- a/romans Thu Jan 01 00:00:00 1970 +0000 | 1810 --- a/romans Thu Jan 01 00:00:00 1970 +0000 |
| 1807 +++ b/romans Thu Jan 01 00:00:00 1970 +0000 | 1811 +++ b/romans Thu Jan 01 00:00:00 1970 +0000 |
| 1808 @@ -1,5 +1,5 @@ | 1812 @@ -1,5 +1,5 @@ |
| 1809 I | 1813 I |
| 1810 -II | 1814 - II |
| 1811 +ii | 1815 + ii |
| 1812 III | 1816 III |
| 1813 IV | 1817 IV |
| 1814 V | 1818 V |
| 1815 | 1819 |
| 1816 | 1820 |