changeset 5060 | 2ef14e29e538 |
parent 5059 | 8d9bdcbb2b18 |
5057:99a4592ea886 | 5060:2ef14e29e538 |
---|---|
1 #!/bin/sh |
|
2 |
|
3 mkdir t |
|
4 cd t |
|
5 hg init |
|
6 |
|
7 echo 1 > a |
|
8 hg ci -qAm "first" -d "1000000 0" |
|
9 |
|
10 hg cp a b |
|
11 hg mv a c |
|
12 echo 2 >> b |
|
13 echo 2 >> c |
|
14 |
|
15 hg ci -qAm "second" -d "1000000 0" |
|
16 |
|
17 hg co -C 0 |
|
18 |
|
19 echo 0 > a |
|
20 echo 1 >> a |
|
21 |
|
22 hg ci -qAm "other" -d "1000000 0" |
|
23 |
|
24 hg merge --debug |
|
25 |
|
26 echo "-- b --" |
|
27 cat b |
|
28 |
|
29 echo "-- c --" |
|
30 cat c |