Mercurial > hg-stable
changeset 15313:3eb1a90ea409 stable
largefiles: fix newline for lfconverted repos
| author | Eli Carter <eli.carter@tektronix.com> |
|---|---|
| date | Tue, 18 Oct 2011 17:28:26 -0500 |
| parents | 8d862e7b96d4 |
| children | 1ae824142c01 |
| files | hgext/largefiles/lfcommands.py tests/test-largefiles.t |
| diffstat | 2 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/lfcommands.py Wed Oct 19 15:37:03 2011 -0500 +++ b/hgext/largefiles/lfcommands.py Tue Oct 18 17:28:26 2011 -0500 @@ -291,7 +291,7 @@ # doesn't change after rename or copy renamed = lfutil.standin(renamed[0]) - return context.memfilectx(f, lfiletohash[srcfname], 'l' in + return context.memfilectx(f, lfiletohash[srcfname] + '\n', 'l' in fctx.flags(), 'x' in fctx.flags(), renamed) else: try:
--- a/tests/test-largefiles.t Wed Oct 19 15:37:03 2011 -0500 +++ b/tests/test-largefiles.t Tue Oct 18 17:28:26 2011 -0500 @@ -683,5 +683,21 @@ fncache store dotencode + +Make sure that lfconvert includes a newline at the end of the standin files. + $ cd largefiles-repo + $ hg up + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + getting changed largefiles + 1 largefiles updated, 0 removed + $ cat .hglf/a-large-file + 8b0629c630f530cde051aeb42ce561756738fbe7 + $ dd if=/dev/zero bs=1k count=11k > another-large-file 2> /dev/null + $ hg add another-large-file + $ hg commit -m "Commit another file that should get automatically added as a largefile" + $ cat .hglf/a-large-file .hglf/another-large-file + 8b0629c630f530cde051aeb42ce561756738fbe7 + 187a0f76e02aac9c24f71c820be1f34ef1c76e76 + $ cd .. $ rm -rf bigfile-repo largefiles-repo