changeset 4820 | 9797124581c9 |
4815:8808ea7da86b | 4820:9797124581c9 |
---|---|
1 #!/bin/sh |
|
2 |
|
3 mkdir t |
|
4 cd t |
|
5 |
|
6 hg init |
|
7 mkdir src |
|
8 echo a > src/a.c |
|
9 hg ci -Ama -d "10000000 0" |
|
10 |
|
11 hg mv src source |
|
12 hg ci -Ammove -d "1000000 0" |
|
13 |
|
14 hg co -C 0 |
|
15 echo new > src/a.c |
|
16 echo compiled > src/a.o |
|
17 hg ci -mupdate -d "1000000 0" |
|
18 |
|
19 hg st |
|
20 |
|
21 hg merge |
|
22 |
|
23 hg st |
|
24 |