view tests/test-resolve.out @ 8044:c1e2b7407dc3

purge: fix b777dd8f7836 (remove read-only files)

- use try/except to avoid unnecessary work
- edit only mode bits

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% resolve -l, should be empty