Mercurial > hg-stable
comparison tests/test-log.t @ 23704:c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
The follow revset (used by `hg log --follow`) now uses the new 'introrev'
method to bootstrap its traversal. This catches issues from linkrev-shadowing of
the changesets introducing the version of a file in source changeset.
A new test has been added to display pathological cases.
Another test is affected because it was meant to test this behavior but actually
failed to do so for half of the output. The output are now similar.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Mon, 29 Dec 2014 23:40:24 -0800 |
parents | c48924787eaa |
children | 34364a4b25eb |
comparison
equal
deleted
inserted
replaced
23703:aaa76612b3c0 | 23704:c624fb2c4239 |
---|---|
1557 @ c | 1557 @ c |
1558 | | 1558 | |
1559 o a | 1559 o a |
1560 | 1560 |
1561 $ hg log -f d/a -T '{desc}' -G | 1561 $ hg log -f d/a -T '{desc}' -G |
1562 o b | 1562 @ c |
1563 | | 1563 | |
1564 o a | 1564 o a |
1565 | 1565 |
1566 $ cd .. | 1566 $ cd .. |
1567 | 1567 |
1654 o changeset: 0:ae0a3c9f9e95 | 1654 o changeset: 0:ae0a3c9f9e95 |
1655 user: test | 1655 user: test |
1656 date: Thu Jan 01 00:00:00 1970 +0000 | 1656 date: Thu Jan 01 00:00:00 1970 +0000 |
1657 summary: content1 | 1657 summary: content1 |
1658 | 1658 |
1659 | |
1660 hg log -f from the grafted changeset | |
1661 (The bootstrap should properly take the topology in account) | |
1662 | |
1663 $ hg up 'desc(content3)^' | |
1664 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1665 $ hg log -Gf a | |
1666 @ changeset: 3:15b2327059e5 | |
1667 | user: test | |
1668 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1669 | summary: content2 | |
1670 | | |
1671 o changeset: 0:ae0a3c9f9e95 | |
1672 user: test | |
1673 date: Thu Jan 01 00:00:00 1970 +0000 | |
1674 summary: content1 | |
1675 | |
1659 $ cd .. | 1676 $ cd .. |