equal
deleted
inserted
replaced
10 |
10 |
11 hg clone . ../r2 |
11 hg clone . ../r2 |
12 cd ../r2 |
12 cd ../r2 |
13 hg up |
13 hg up |
14 echo abc > a |
14 echo abc > a |
15 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
15 hg diff --nodates |
16 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
|
17 |
16 |
18 cd ../r1 |
17 cd ../r1 |
19 echo b > b |
18 echo b > b |
20 echo a2 > a |
19 echo a2 > a |
21 hg addremove |
20 hg addremove |
32 hg --debug merge || echo failed |
31 hg --debug merge || echo failed |
33 hg parents |
32 hg parents |
34 hg --debug up |
33 hg --debug up |
35 hg parents |
34 hg parents |
36 hg -v history |
35 hg -v history |
37 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
36 hg diff --nodates |
38 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
|
39 |
37 |
40 # create a second head |
38 # create a second head |
41 cd ../r1 |
39 cd ../r1 |
42 hg up 0 |
40 hg up 0 |
43 echo b2 > b |
41 echo b2 > b |
51 hg parents |
49 hg parents |
52 hg --debug up || echo failed |
50 hg --debug up || echo failed |
53 hg --debug merge || echo failed |
51 hg --debug merge || echo failed |
54 hg --debug merge -f |
52 hg --debug merge -f |
55 hg parents |
53 hg parents |
56 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
54 hg diff --nodates |
57 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
|
58 |
55 |
59 # test a local add |
56 # test a local add |
60 cd .. |
57 cd .. |
61 hg init a |
58 hg init a |
62 hg init b |
59 hg init b |