Show More
@@ -49,7 +49,7 b' def _adjustlinkrev(repo, path, filelog, ' | |||
|
49 | 49 | if path in ac[3]: # checking the 'files' field. |
|
50 | 50 | # The file has been touched, check if the content is similar |
|
51 | 51 | # to the one we search for. |
|
52 |
if fnode == ma.read |
|
|
52 | if fnode == ma.readfast(ac[0]).get(path): | |
|
53 | 53 | return a |
|
54 | 54 | # In theory, we should never get out of that loop without a result. But |
|
55 | 55 | # if manifest uses a buggy file revision (not children of the one it |
@@ -1842,3 +1842,62 b' Even when the file revision is missing f' | |||
|
1842 | 1842 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1843 | 1843 | | summary: 1 |
|
1844 | 1844 | | |
|
1845 | $ cd .. | |
|
1846 | ||
|
1847 | Check proper report when the manifest changes but not the file issue4499 | |
|
1848 | ------------------------------------------------------------------------ | |
|
1849 | ||
|
1850 | $ hg init issue4499 | |
|
1851 | $ cd issue4499 | |
|
1852 | $ for f in A B C D F E G H I J K L M N O P Q R S T U; do | |
|
1853 | > echo 1 > $f; | |
|
1854 | > hg add $f; | |
|
1855 | > done | |
|
1856 | $ hg commit -m 'A1B1C1' | |
|
1857 | $ echo 2 > A | |
|
1858 | $ echo 2 > B | |
|
1859 | $ echo 2 > C | |
|
1860 | $ hg commit -m 'A2B2C2' | |
|
1861 | $ hg up 0 | |
|
1862 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
1863 | $ echo 3 > A | |
|
1864 | $ echo 2 > B | |
|
1865 | $ echo 2 > C | |
|
1866 | $ hg commit -m 'A3B2C2' | |
|
1867 | created new head | |
|
1868 | ||
|
1869 | $ hg log -G | |
|
1870 | @ changeset: 2:fe5fc3d0eb17 | |
|
1871 | | tag: tip | |
|
1872 | | parent: 0:abf4f0e38563 | |
|
1873 | | user: test | |
|
1874 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1875 | | summary: A3B2C2 | |
|
1876 | | | |
|
1877 | | o changeset: 1:07dcc6b312c0 | |
|
1878 | |/ user: test | |
|
1879 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1880 | | summary: A2B2C2 | |
|
1881 | | | |
|
1882 | o changeset: 0:abf4f0e38563 | |
|
1883 | user: test | |
|
1884 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1885 | summary: A1B1C1 | |
|
1886 | ||
|
1887 | ||
|
1888 | Log -f on B should reports current changesets | |
|
1889 | ||
|
1890 | $ hg log -fG B | |
|
1891 | @ changeset: 2:fe5fc3d0eb17 | |
|
1892 | | tag: tip | |
|
1893 | | parent: 0:abf4f0e38563 | |
|
1894 | | user: test | |
|
1895 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1896 | | summary: A3B2C2 | |
|
1897 | | | |
|
1898 | o changeset: 0:abf4f0e38563 | |
|
1899 | user: test | |
|
1900 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1901 | summary: A1B1C1 | |
|
1902 | ||
|
1903 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now