equal
deleted
inserted
replaced
1 + mkdir r1 |
1 + mkdir r1 |
2 + cd r1 |
2 + cd r1 |
3 + hg init |
3 + hg init |
4 + echo a |
4 + echo a |
5 + hg addremove |
5 + hg addremove |
|
6 adding a |
6 + hg commit -m 1 -d '0 0' |
7 + hg commit -m 1 -d '0 0' |
7 + hg clone . ../r2 |
8 + hg clone . ../r2 |
8 + cd ../r2 |
9 + cd ../r2 |
9 + hg up |
10 + hg up |
10 + echo abc |
11 + echo abc |
18 +abc |
19 +abc |
19 + cd ../r1 |
20 + cd ../r1 |
20 + echo b |
21 + echo b |
21 + echo a2 |
22 + echo a2 |
22 + hg addremove |
23 + hg addremove |
|
24 adding b |
23 + hg commit -m 2 -d '0 0' |
25 + hg commit -m 2 -d '0 0' |
24 + cd ../r2 |
26 + cd ../r2 |
25 + hg -q pull ../r1 |
27 + hg -q pull ../r1 |
26 + hg status |
28 + hg status |
27 M a |
29 M a |
66 1 |
68 1 |
67 |
69 |
68 |
70 |
69 + hg diff |
71 + hg diff |
70 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
72 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
71 diff -r 1e71731e6fbb a |
|
72 --- a/a |
|
73 +++ b/a |
|
74 @@ -1,1 +1,1 @@ |
|
75 -a2 |
|
76 +abc |
|