##// 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.
Martin Geisler - - Load All Authors

File last commit:

r8167:6c82beaa default
r10521:bde1bb25 stable
Show More
test-resolve
27 lines | 417 B | text/plain | TextLexer
/ tests / test-resolve
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# test that a commit clears the merge state.
hg init repo
cd repo
echo foo > file
hg commit -Am 'add file'
echo bar >> file
hg commit -Am 'append bar'
echo % create a second head
hg up -C 0
echo baz >> file
hg commit -Am 'append baz'
echo % failing merge
HGMERGE=internal:fail hg merge
echo resolved > file
hg resolve -m file
hg commit -m 'resolved'
echo % resolve -l, should be empty
hg resolve -l