Mercurial > public > mercurial-scm > hg-stable

diff tests/test-largefiles.t @ 26817:b68797f244e4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/tests/test-largefiles.t	Wed Oct 21 00:10:46 2015 +0200
+++ b/tests/test-largefiles.t	Wed Oct 21 00:18:11 2015 +0200
@@ -1850,7 +1850,7 @@
   .hglf/normal3
   .hglf/sub2/large6
   .hglf/sub2/large7
-  normal3
+  large4-renamed
   sub/normal4
 
   $ cd ..