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 + hg commit -t 1 -u test -d '0 0' |
6 + hg commit -m 1 -d '0 0' |
7 + hg clone . ../r2 |
7 + hg clone . ../r2 |
8 + cd ../r2 |
8 + cd ../r2 |
9 + hg up |
9 + hg up |
10 + echo abc |
10 + echo abc |
11 + hg diff |
11 + hg diff |
18 +abc |
18 +abc |
19 + cd ../r1 |
19 + cd ../r1 |
20 + echo b |
20 + echo b |
21 + echo a2 |
21 + echo a2 |
22 + hg addremove |
22 + hg addremove |
23 + hg commit -t 2 -u test -d '0 0' |
23 + hg commit -m 2 -d '0 0' |
24 + cd ../r2 |
24 + cd ../r2 |
25 + hg -q pull ../r1 |
25 + hg -q pull ../r1 |
26 + hg status |
26 + hg status |
27 M a |
27 M a |
28 + hg --debug up |
28 + hg --debug up |