equal
deleted
inserted
replaced
36 hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
36 hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
37 cd new |
37 cd new |
38 hg out ../orig |
38 hg out ../orig |
39 cd .. |
39 cd .. |
40 |
40 |
|
41 echo '% check shamap LF and CRLF handling' |
|
42 cat > rewrite.py <<EOF |
|
43 import sys |
|
44 # Interlace LF and CRLF |
|
45 lines = [(l.rstrip() + ((i % 2) and '\n' or '\r\n')) |
|
46 for i, l in enumerate(file(sys.argv[1]))] |
|
47 file(sys.argv[1], 'wb').write(''.join(lines)) |
|
48 EOF |
|
49 python rewrite.py new/.hg/shamap |
|
50 cd orig |
|
51 hg up -qC 1 |
|
52 echo foo >> foo |
|
53 hg ci -qm 'change foo again' |
|
54 hg up -qC 2 |
|
55 echo foo >> foo |
|
56 hg ci -qm 'change foo again again' |
|
57 cd .. |
|
58 hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
|
59 |
41 echo % init broken repository |
60 echo % init broken repository |
42 hg init broken |
61 hg init broken |
43 cd broken |
62 cd broken |
44 echo a >> a |
63 echo a >> a |
45 echo b >> b |
64 echo b >> b |