##// 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.
Adrian Buehlmann - - Load All Authors

File last commit:

r9611:a3d73b3e default
r10521:bde1bb25 stable
Show More
test-merge8.out
10 lines | 345 B | text/plain | TextLexer
/ tests / test-merge8.out
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Thomas Arendsen Hein
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)...
 r3389 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
Matt Mackall
merge: fix spurious merges for copies in linear updates...
 r4416 1 files updated, 0 files merged, 1 files removed, 0 files unresolved