equal
deleted
inserted
replaced
2 |
2 |
3 mkdir t |
3 mkdir t |
4 cd t |
4 cd t |
5 hg init |
5 hg init |
6 echo a > a |
6 echo a > a |
7 hg ci -Ama -d '1000000000 0' |
7 hg ci -Ama |
8 echo b > b |
8 echo b > b |
9 hg branch b |
9 hg branch b |
10 hg ci -Amb -d '1000000000 0' |
10 hg ci -Amb |
11 hg co -C 0 |
11 hg co -C 0 |
12 |
12 |
13 echo fast-forward |
13 echo fast-forward |
14 hg merge b |
14 hg merge b |
15 hg ci -Ammerge -d '1000000000 0' |
15 hg ci -Ammerge |
16 |
16 |
17 echo bogus fast-forward should fail |
17 echo bogus fast-forward should fail |
18 hg merge b |
18 hg merge b |
19 |
19 |
20 echo done |
20 echo done |