##// 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.
Greg Ward - - Load All Authors

File last commit:

r8084:5b3fee9c default
r10521:bde1bb25 stable
Show More
test-convert-bzr-merges
43 lines | 1016 B | text/plain | TextLexer
/ tests / test-convert-bzr-merges
History | Source | Raw |Copy content |Copy permalink
Marek Kubica
convert: add bzr source
 r7053 #!/bin/sh
Greg Ward
Add comment about this test failing under bzr 1.13 due to a bug in bzr.
 r8084 # N.B. bzr 1.13 has a bug that breaks this test. If you see this
# test fail, check your bzr version. Upgrading to bzr 1.13.1
# should fix it.
Benoit Boissinot
`source` doesn't work for some /bin/sh, use `.` instead
 r7058 . "$TESTDIR/bzr-definitions"
Marek Kubica
convert: add bzr source
 r7053
echo % test multiple merges at once
mkdir test-multimerge
cd test-multimerge
bzr init -q source
cd source
echo content > file
bzr add -q file
bzr commit -q -m 'Initial add'
cd ..
bzr branch -q source source-branch1
cd source-branch1
echo morecontent >> file
echo evenmorecontent > file-branch1
bzr add -q file-branch1
bzr commit -q -m 'Added branch1 file'
cd ../source
Dirkjan Ochtman
tests: shrink wait interval for test-convert-bzr-merges
 r7604 sleep 1
Marek Kubica
convert: add bzr source
 r7053 echo content > file-parent
bzr add -q file-parent
bzr commit -q -m 'Added parent file'
cd ..
bzr branch -q source source-branch2
cd source-branch2
echo somecontent > file-branch2
bzr add -q file-branch2
bzr commit -q -m 'Added brach2 file'
Dirkjan Ochtman
tests: shrink wait interval for test-convert-bzr-merges
 r7604 sleep 1
Marek Kubica
convert: add bzr source
 r7053 cd ../source
bzr merge -q ../source-branch1
bzr merge -q --force ../source-branch2
bzr commit -q -m 'Merged branches'
cd ..
hg convert --datesort source source-hg
glog -R source-hg
manifest source-hg tip