# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1321982219 -3600
# Node ID 1fd126cd2d91abb1e895b559e88f949b2504d133
# Parent  7f1d263a1bcbc94271cf4ecd355f573488138071# Parent  f76584098c88fadcb74a8aa5c9c7efb2fb25b682
merge with stable

diff -r 7f1d263a1bcb -r 1fd126cd2d91 hgext/largefiles/lfutil.py
--- a/hgext/largefiles/lfutil.py	Tue Nov 22 01:37:26 2011 +0100
+++ b/hgext/largefiles/lfutil.py	Tue Nov 22 18:16:59 2011 +0100
@@ -158,7 +158,7 @@
             try:
                 if hash == hashfile(lfile):
                     lfdirstate.normal(lfile)
-            except IOError, err:
+            except OSError, err:
                 if err.errno != errno.ENOENT:
                     raise
 
diff -r 7f1d263a1bcb -r 1fd126cd2d91 tests/test-largefiles.t
--- a/tests/test-largefiles.t	Tue Nov 22 01:37:26 2011 +0100
+++ b/tests/test-largefiles.t	Tue Nov 22 18:16:59 2011 +0100
@@ -254,13 +254,12 @@
 
 Clone a largefiles repo.
 
-  $ cd ..
-  $ hg clone a b
+  $ hg clone . ../b
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   getting changed largefiles
   3 largefiles updated, 0 removed
-  $ cd b
+  $ cd ../b
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   7:daea875e9014  add/edit more largefiles
   6:4355d653f84f  edit files yet again