##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Do not use osutil.c with python 2.4 and Windows (issue1364)...
Do not use osutil.c with python 2.4 and Windows (issue1364) Windows python 2.4 os.stat() reports times including DST offset, while osutil.c reports the correct value, which makes status() systematically compare files content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c is 4x times slower on large repositories but current code is completely unusable. Given few people are likely to use python 2.4 on Windows this solution was considered a good trade-off compared to more invasive solutions trying to address the offset issue.
Stuart W Marks - - Load All Authors

File last commit:

r9468:b2310903 default
r10521:bde1bb25 stable
Show More
test-commit-unresolved.out
14 lines | 480 B | text/plain | TextLexer
/ tests / test-commit-unresolved.out
History | Annotation | Raw |Copy content |Copy permalink
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
% Merging a conflict araises
merging A
warning: conflicts during merge.
merging A failed!
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% Correct the conflict without marking the file as resolved
abort: unresolved merge conflicts (see hg resolve)
% Mark the conflict as resolved and commit