Show More
@@ -68,7 +68,7 b' Check that commit -i works with no chang' | |||||
68 | Committing only one file |
|
68 | Committing only one file | |
69 |
|
69 | |||
70 | $ echo "a" >> a |
|
70 | $ echo "a" >> a | |
71 | >>> open('b', 'wb').write("1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n") |
|
71 | >>> open('b', 'wb').write(b"1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n") and None | |
72 | $ hg add b |
|
72 | $ hg add b | |
73 | $ cat <<EOF >testModeCommands |
|
73 | $ cat <<EOF >testModeCommands | |
74 | > TOGGLE |
|
74 | > TOGGLE |
@@ -122,7 +122,7 b' Create a non-inlined filelog in r3:' | |||||
122 | $ cd r3/d1 |
|
122 | $ cd r3/d1 | |
123 | >>> f = open('data1', 'wb') |
|
123 | >>> f = open('data1', 'wb') | |
124 | >>> for x in range(10000): |
|
124 | >>> for x in range(10000): | |
125 |
... f.write( |
|
125 | ... f.write(b"%d\n" % x) and None | |
126 | >>> f.close() |
|
126 | >>> f.close() | |
127 | $ for j in 0 1 2 3 4 5 6 7 8 9; do |
|
127 | $ for j in 0 1 2 3 4 5 6 7 8 9; do | |
128 | > cat data1 >> f2 |
|
128 | > cat data1 >> f2 |
@@ -143,7 +143,7 b" Test that --exact on a bad header doesn'" | |||||
143 | $ hg export 2 | head -7 > ../a.patch |
|
143 | $ hg export 2 | head -7 > ../a.patch | |
144 | $ hg export tip > out |
|
144 | $ hg export tip > out | |
145 | >>> apatch = open("../a.patch", "ab") |
|
145 | >>> apatch = open("../a.patch", "ab") | |
146 | >>> apatch.write("".join(open("out").readlines()[7:])) |
|
146 | >>> apatch.write(b"".join(open("out", 'rb').readlines()[7:])) and None | |
147 |
|
147 | |||
148 | $ cd .. |
|
148 | $ cd .. | |
149 | $ hg clone -qr0 repo3 repo3-clone |
|
149 | $ hg clone -qr0 repo3 repo3-clone |
@@ -22,16 +22,16 b' 10 run the same test than 8 from within ' | |||||
22 | $ mkdir -p a/folder1 a/folder2 |
|
22 | $ mkdir -p a/folder1 a/folder2 | |
23 | $ cd a |
|
23 | $ cd a | |
24 | $ hg init |
|
24 | $ hg init | |
25 | >>> open('f', 'wb').write("1\n2\n3\n4\n5\n") |
|
25 | >>> open('f', 'wb').write(b"1\n2\n3\n4\n5\n") and None | |
26 | $ hg add f ; hg commit -m "adding f" |
|
26 | $ hg add f ; hg commit -m "adding f" | |
27 | $ cat f > folder1/g ; hg add folder1/g ; hg commit -m "adding folder1/g" |
|
27 | $ cat f > folder1/g ; hg add folder1/g ; hg commit -m "adding folder1/g" | |
28 | $ cat f > folder2/h ; hg add folder2/h ; hg commit -m "adding folder2/h" |
|
28 | $ cat f > folder2/h ; hg add folder2/h ; hg commit -m "adding folder2/h" | |
29 | $ cat f > folder1/i ; hg add folder1/i ; hg commit -m "adding folder1/i" |
|
29 | $ cat f > folder1/i ; hg add folder1/i ; hg commit -m "adding folder1/i" | |
30 | >>> open('f', 'wb').write("a\n1\n2\n3\n4\n5\nb\n") |
|
30 | >>> open('f', 'wb').write(b"a\n1\n2\n3\n4\n5\nb\n") and None | |
31 |
$ |
|
31 | $ hg commit -m "modifying f" | |
32 | >>> open('folder1/g', 'wb').write("c\n1\n2\n3\n4\n5\nd\n") |
|
32 | >>> open('folder1/g', 'wb').write(b"c\n1\n2\n3\n4\n5\nd\n") and None | |
33 |
$ |
|
33 | $ hg commit -m "modifying folder1/g" | |
34 | >>> open('folder2/h', 'wb').write("e\n1\n2\n3\n4\n5\nf\n") |
|
34 | >>> open('folder2/h', 'wb').write(b"e\n1\n2\n3\n4\n5\nf\n") and None | |
35 |
$ |
|
35 | $ hg commit -m "modifying folder2/h" | |
36 | $ hg tip |
|
36 | $ hg tip | |
37 | changeset: 6:59dd6e4ab63a |
|
37 | changeset: 6:59dd6e4ab63a | |
@@ -182,7 +182,7 b' Test --no-backup' | |||||
182 |
|
182 | |||
183 | $ ls folder1/ |
|
183 | $ ls folder1/ | |
184 | g |
|
184 | g | |
185 | >>> open('folder1/g', 'wb').write("1\n2\n3\n4\n5\nd\n") |
|
185 | >>> open('folder1/g', 'wb').write(b"1\n2\n3\n4\n5\nd\n") and None | |
186 |
|
186 | |||
187 |
|
187 | |||
188 | $ hg update -C 6 |
|
188 | $ hg update -C 6 |
General Comments 0
You need to be logged in to leave comments.
Login now