equal
deleted
inserted
replaced
1 #!/bin/sh |
|
2 |
|
3 echo % init foo-base |
|
4 hg init foo-base |
|
5 |
|
6 echo % create alpha in first repo |
|
7 cd foo-base |
|
8 echo 'alpha' > alpha |
|
9 hg ci -A -m 'add alpha' -d '1 0' |
|
10 cd .. |
|
11 |
|
12 echo % clone foo-base to foo-work |
|
13 hg clone foo-base foo-work |
|
14 |
|
15 echo % create beta in second repo |
|
16 cd foo-work |
|
17 echo 'beta' > beta |
|
18 hg ci -A -m 'add beta' -d '2 0' |
|
19 cd .. |
|
20 |
|
21 echo % create gamma in first repo |
|
22 cd foo-base |
|
23 echo 'gamma' > gamma |
|
24 hg ci -A -m 'add gamma' -d '3 0' |
|
25 cd .. |
|
26 |
|
27 echo % pull into work and merge |
|
28 cd foo-work |
|
29 hg pull -q |
|
30 hg merge |
|
31 |
|
32 echo % revert to changeset 1 to simulate a failed merge |
|
33 rm alpha beta gamma |
|
34 hg up -C 1 |
|