20 |
20 |
21 |
21 |
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 $ hg commit -m "modifying f" |
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 $ hg commit -m "modifying folder1/g" |
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 $ hg commit -m "modifying folder2/h" |
35 $ hg commit -m "modifying folder2/h" |
36 $ hg tip |
36 $ hg tip |
37 changeset: 6:59dd6e4ab63a |
37 changeset: 6:59dd6e4ab63a |
38 tag: tip |
38 tag: tip |
39 user: test |
39 user: test |
180 -d |
180 -d |
181 apply this change to 'folder1/g'? [Ynesfdaq?] y |
181 apply this change to 'folder1/g'? [Ynesfdaq?] y |
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 |
189 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
190 $ hg revert -i -r 2 --all -- << EOF |
190 $ hg revert -i -r 2 --all -- << EOF |