view tests/test-pull-r.out @ 10428:e553a425751d stable

convert: differentiate between IOError and OSError on commitctx() The IOError exception is overloaded to mean 'this file was deleted in the current commit'. Separate the code that handles IOError and file deletion from general OSError exceptions. The latter are real errors, but IOError is not always a throwable error. This solves the accidental marking of files as 'deleted' in commits that try to write for example in .hg/store/data revlogs that the current user has no permission to modify (a normal OSError that should abort the current commit). Changed by pmezard: use getattr() to be on the safe side.
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Thu, 11 Feb 2010 23:15:42 +0200
parents b8346ae5d64b
children d42821cd5c96
line wrap: on
line source

changeset:   2:effea6de0384
tag:         tip
parent:      0:bbd179dfa0a7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add bar

changeset:   1:ed1b79f46b9a
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change foo

changeset:   0:bbd179dfa0a7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo

% pull a missing revision
abort: unknown revision 'missing'!
% pull -r 0
changeset:   0:bbd179dfa0a7
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo

% pull -r 1
changeset:   1:ed1b79f46b9a
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change foo

changeset:   0:bbd179dfa0a7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo

% pull -r 1 again