comparison tests/test-relink.t @ 13659:a73f38d8bbdb

merge with stable
author Martin Geisler <mg@lazybytes.net>
date Wed, 16 Mar 2011 16:07:06 +0100
parents 0e200e1801f4 b69102740e57
children 9910f60a37ee
comparison
equal deleted inserted replaced
13656:0e200e1801f4 13659:a73f38d8bbdb
33 formatting of final byte count 33 formatting of final byte count
34 34
35 $ cat $TESTDIR/binfile.bin >> a 35 $ cat $TESTDIR/binfile.bin >> a
36 $ cat $TESTDIR/binfile.bin >> b 36 $ cat $TESTDIR/binfile.bin >> b
37 $ hg ci -m anotherchange 37 $ hg ci -m anotherchange
38
39 don't sit forever trying to double-lock the source repo
40
41 $ hg relink .
42 relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store
43 there is nothing to relink
44
38 45
39 Test files are read in binary mode 46 Test files are read in binary mode
40 47
41 $ python -c "file('.hg/store/data/dummy.i', 'wb').write('a\r\nb\n')" 48 $ python -c "file('.hg/store/data/dummy.i', 'wb').write('a\r\nb\n')"
42 $ cd .. 49 $ cd ..