equal
deleted
inserted
replaced
7 hg init a |
7 hg init a |
8 cd a |
8 cd a |
9 mkdir -p testdir |
9 mkdir -p testdir |
10 echo a > testdir/a |
10 echo a > testdir/a |
11 hg add testdir/a |
11 hg add testdir/a |
12 hg commit -u test -d '1000000 0' -m a |
12 hg commit -d '1000000 0' -m a |
13 cd .. |
13 cd .. |
14 |
14 |
15 hg clone a b |
15 hg clone a b |
16 cd a |
16 cd a |
17 echo alpha > testdir/a |
17 echo alpha > testdir/a |
18 hg commit -u test -d '1000000 0' -m remote-change |
18 hg commit -d '1000000 0' -m remote-change |
19 cd .. |
19 cd .. |
20 |
20 |
21 cd b |
21 cd b |
22 mkdir testdir/subdir |
22 mkdir testdir/subdir |
23 hg mv testdir/a testdir/subdir/a |
23 hg mv testdir/a testdir/subdir/a |
24 hg commit -u test -d '1000000 0' -m move |
24 hg commit -d '1000000 0' -m move |
25 mkdir newdir |
25 mkdir newdir |
26 echo beta > newdir/beta |
26 echo beta > newdir/beta |
27 hg add newdir/beta |
27 hg add newdir/beta |
28 hg commit -u test -d '1000000 0' -m local-addition |
28 hg commit -d '1000000 0' -m local-addition |
29 hg pull ../a |
29 hg pull ../a |
30 hg up -C 2 |
30 hg up -C 2 |
31 hg merge |
31 hg merge |
32 hg stat |
32 hg stat |
33 hg diff --nodates |
33 hg diff --nodates |