view tests/test-rebase-mq-skip.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 7b19cda0fa10
children c7dbd6c4877a
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved

% "Mainstream" import p1.patch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
applying p1.patch

% Rebase
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
rebase completed
@  3 P0 tags: p0.patch qtip tip qbase
|
o  2 P1 tags: qparent
|
o  1 R1 tags:
|
o  0 C1 tags: