Mercurial > hg
view tests/test-convert-datesort.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 | 827d4e807d57 |
children | 5b48d819d5f9 |
line wrap: on
line source
adding a marked working directory as branch brancha 1 files updated, 0 files merged, 0 files removed, 0 files unresolved marked working directory as branch branchb adding b created new head 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % convert with datesort initializing destination t-datesort repository scanning source... sorting... converting... 8 a0 7 a1 6 a2 5 a3 4 a4 3 b0 2 a5 1 a6 0 b1 % graph converted repo o 8 "b1" | | o 7 "a6" | | | o 6 "a5" | | o | 5 "b0" | | | o 4 "a4" | | | o 3 "a3" | | | o 2 "a2" | | | o 1 "a1" |/ o 0 "a0" % convert with datesort (default mode) initializing destination t-sourcesort repository scanning source... sorting... converting... 8 a0 7 a1 6 a2 5 a3 4 b0 3 a4 2 a5 1 a6 0 b1 % graph converted repo o 8 "b1" | | o 7 "a6" | | | o 6 "a5" | | | o 5 "a4" | | o | 4 "b0" | | | o 3 "a3" | | | o 2 "a2" | | | o 1 "a1" |/ o 0 "a0"