##// 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.
Steve Borho - - Load All Authors

File last commit:

r8545:3682a19b default
r10521:bde1bb25 stable
Show More
test-merge-force.out
11 lines | 332 B | text/plain | TextLexer
/ tests / test-merge-force.out
History | Source | Raw |Copy content |Copy permalink
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Alexis S. L. Carvalho
add a test for a375ffc2aa1b
 r6255 % local deleted a file, remote removed
Steve Borho
merge: give hint as to how to discover uncommitted changes...
 r8545 abort: outstanding uncommitted changes (use 'hg status' to list changes)
Alexis S. L. Carvalho
add a test for a375ffc2aa1b
 r6255 resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b