Show More
@@ -837,8 +837,9 b' def filelog(repo, subset, x):' | |||
|
837 | 837 | if lowesthead is None: |
|
838 | 838 | lowesthead = {} |
|
839 | 839 | for h in repo.heads(): |
|
840 |
fnode = repo[h].manifest() |
|
|
841 |
|
|
|
840 | fnode = repo[h].manifest().get(f) | |
|
841 | if fnode is not None: | |
|
842 | lowesthead[fl.rev(fnode)] = h | |
|
842 | 843 | headrev = lowesthead.get(fr) |
|
843 | 844 | if headrev is None: |
|
844 | 845 | # content is nowhere unfiltered |
@@ -1744,3 +1744,59 b' Even when a head revision is linkrev-sha' | |||
|
1744 | 1744 | |
|
1745 | 1745 | |
|
1746 | 1746 | $ cd .. |
|
1747 | ||
|
1748 | Even when the file revision is missing from some head: | |
|
1749 | ||
|
1750 | $ hg init issue4490 | |
|
1751 | $ cd issue4490 | |
|
1752 | $ echo '[experimental]' >> .hg/hgrc | |
|
1753 | $ echo 'evolution=createmarkers' >> .hg/hgrc | |
|
1754 | $ echo a > a | |
|
1755 | $ hg ci -Am0 | |
|
1756 | adding a | |
|
1757 | $ echo b > b | |
|
1758 | $ hg ci -Am1 | |
|
1759 | adding b | |
|
1760 | $ echo B > b | |
|
1761 | $ hg ci --amend -m 1 | |
|
1762 | $ hg up 0 | |
|
1763 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
1764 | $ echo c > c | |
|
1765 | $ hg ci -Am2 | |
|
1766 | adding c | |
|
1767 | created new head | |
|
1768 | $ hg up 'head() and not .' | |
|
1769 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
1770 | $ hg log -G | |
|
1771 | o changeset: 4:db815d6d32e6 | |
|
1772 | | tag: tip | |
|
1773 | | parent: 0:f7b1eb17ad24 | |
|
1774 | | user: test | |
|
1775 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1776 | | summary: 2 | |
|
1777 | | | |
|
1778 | | @ changeset: 3:9bc8ce7f9356 | |
|
1779 | |/ parent: 0:f7b1eb17ad24 | |
|
1780 | | user: test | |
|
1781 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1782 | | summary: 1 | |
|
1783 | | | |
|
1784 | o changeset: 0:f7b1eb17ad24 | |
|
1785 | user: test | |
|
1786 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1787 | summary: 0 | |
|
1788 | ||
|
1789 | $ hg log -f -G b | |
|
1790 | @ changeset: 3:9bc8ce7f9356 | |
|
1791 | | parent: 0:f7b1eb17ad24 | |
|
1792 | | user: test | |
|
1793 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1794 | | summary: 1 | |
|
1795 | | | |
|
1796 | $ hg log -G b | |
|
1797 | @ changeset: 3:9bc8ce7f9356 | |
|
1798 | | parent: 0:f7b1eb17ad24 | |
|
1799 | | user: test | |
|
1800 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1801 | | summary: 1 | |
|
1802 | | |
General Comments 0
You need to be logged in to leave comments.
Login now