diff -r 77088fa862df -r 69804c040a04 tests/test-lfconvert.t --- a/tests/test-lfconvert.t Wed Jan 09 14:33:06 2019 -0500 +++ b/tests/test-lfconvert.t Wed Jan 09 16:02:05 2019 -0500 @@ -357,20 +357,27 @@ Ensure the largefile can be cached in the source if necessary $ hg clone -U largefiles-repo issue3519 $ rm -f "${USERCACHE}"/* + $ hg -R issue3519 branch -q mybranch + $ hg -R issue3519 ci -m 'change branch name only' $ hg lfconvert --to-normal issue3519 normalized3519 initializing destination normalized3519 4 additional largefiles cached scanning source... sorting... converting... - 7 add large, normal1 - 6 add sub/* - 5 rename sub/ to stuff/ - 4 add normal3, modify sub/* - 3 remove large, normal3 - 2 merge - 1 add anotherlarge (should be a largefile) - 0 Added tag mytag for changeset abacddda7028 + 8 add large, normal1 + 7 add sub/* + 6 rename sub/ to stuff/ + 5 add normal3, modify sub/* + 4 remove large, normal3 + 3 merge + 2 add anotherlarge (should be a largefile) + 1 Added tag mytag for changeset abacddda7028 + 0 change branch name only + +Ensure empty commits aren't lost in the conversion + $ hg -R normalized3519 log -r tip -T '{desc}\n' + change branch name only Ensure the abort message is useful if a largefile is entirely unavailable $ rm -rf normalized3519