##// 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.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r6256:69c75d06 default
r10521:bde1bb25 stable
Show More
test-merge-force
27 lines | 372 B | text/plain | TextLexer
/ tests / test-merge-force
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init repo
cd repo
echo a > a
hg ci -qAm 'add a'
echo b > b
hg ci -qAm 'add b'
hg up -qC 0
hg rm a
hg ci -m 'rm a'
hg up -qC 1
rm a
echo '% local deleted a file, remote removed'
hg merge # should fail, since there are deleted files
hg -v merge --force
echo % should show a as removed
hg st
hg ci -m merge
echo % manifest. should not have a:
hg manifest