Show More
@@ -0,0 +1,34 b'' | |||
|
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 -fr * | |
|
34 | hg up -C 1 |
@@ -0,0 +1,14 b'' | |||
|
1 | % init foo-base | |
|
2 | % create alpha in first repo | |
|
3 | adding alpha | |
|
4 | % clone foo-base to foo-work | |
|
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
6 | % create beta in second repo | |
|
7 | adding beta | |
|
8 | % create gamma in first repo | |
|
9 | adding gamma | |
|
10 | % pull into work and merge | |
|
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
12 | (branch merge, don't forget to commit) | |
|
13 | % revert to changeset 1 to simulate a failed merge | |
|
14 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now