Mercurial > hg-stable
changeset 15549:1fd126cd2d91
merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Tue, 22 Nov 2011 18:16:59 +0100 |
| parents | 7f1d263a1bcb (current diff) f76584098c88 (diff) |
| children | cea62936b39a |
| files | tests/test-largefiles.t |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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