Mercurial > hg
comparison tests/test-largefiles.t @ 26817:b68797f244e4 stable
largefiles: fix explicit commit of normal/largefile switch
Commit of corresponding normal/largefiles pairs would only commit the standin.
That is usually fine, except if either the normal file or the standin is a
remove while the other is an add. In that case it would either give duplicate
colliding entries or lose the file.
Instead, commit both filenames if one of them is a remove.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 21 Oct 2015 00:18:11 +0200 |
| parents | e82bce7ec843 |
| children | 12f727a5b434 |
comparison
equal
deleted
inserted
replaced
| 26816:e82bce7ec843 | 26817:b68797f244e4 |
|---|---|
| 1848 ? sub2/large6-renamed | 1848 ? sub2/large6-renamed |
| 1849 $ hg mani | 1849 $ hg mani |
| 1850 .hglf/normal3 | 1850 .hglf/normal3 |
| 1851 .hglf/sub2/large6 | 1851 .hglf/sub2/large6 |
| 1852 .hglf/sub2/large7 | 1852 .hglf/sub2/large7 |
| 1853 normal3 | 1853 large4-renamed |
| 1854 sub/normal4 | 1854 sub/normal4 |
| 1855 | 1855 |
| 1856 $ cd .. | 1856 $ cd .. |
| 1857 | 1857 |
| 1858 | 1858 |