Mercurial > hg
changeset 29349:8bf84295e59b
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 14 Jun 2016 14:52:58 -0500 |
| parents | 2188f170f5b6 (current diff) f359cdc91e21 (diff) |
| children | 35861cc1076e |
| files | hgext/largefiles/lfutil.py |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/lfutil.py Mon Jun 13 18:20:00 2016 +0100 +++ b/hgext/largefiles/lfutil.py Tue Jun 14 14:52:58 2016 -0500 @@ -214,7 +214,7 @@ if instore(repo, hash): return (path, True) elif repo.shared() and instore(repo, hash, True): - return storepath(repo, hash, True) + return storepath(repo, hash, True), True return (path, False)
--- a/tests/test-largefiles-cache.t Mon Jun 13 18:20:00 2016 +0100 +++ b/tests/test-largefiles-cache.t Tue Jun 14 14:52:58 2016 -0500 @@ -186,6 +186,10 @@ src/.hg/largefiles/dirstate src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020 +Verify that backwards compatibility is maintained for old storage layout + $ mv src/.hg/largefiles/$hash share_dst/.hg/largefiles + $ hg verify --quiet --lfa -R share_dst --config largefiles.usercache= + Inject corruption into the largefiles store and see how update handles that: $ cd src