# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1465933978 18000
# Node ID 8bf84295e59ba0c98e64fd7ccf3f809e4da5b237
# Parent  2188f170f5b60eaddd1f1d6539de2ec07d19e1e3# Parent  f359cdc91e21bb120d2c28049c403d995225ea70
merge with stable

diff -r 2188f170f5b6 -r 8bf84295e59b hgext/largefiles/lfutil.py
--- 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)
 
diff -r 2188f170f5b6 -r 8bf84295e59b tests/test-largefiles-cache.t
--- 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