Show More
@@ -1,52 +1,53 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | hg init |
|
3 | hg init | |
4 | echo a > a |
|
4 | echo a > a | |
5 | hg commit -A -ma |
|
5 | hg commit -A -ma | |
6 |
|
6 | |||
7 |
echo |
|
7 | echo b >> a | |
8 | hg commit -mb |
|
8 | hg commit -mb | |
9 |
|
9 | |||
10 |
echo |
|
10 | echo c >> a | |
11 | hg commit -mc |
|
11 | hg commit -mc | |
12 |
|
12 | |||
13 | hg up 1 |
|
13 | hg up 1 | |
14 |
echo |
|
14 | echo d >> a | |
15 | hg commit -md |
|
15 | hg commit -md | |
16 |
|
16 | |||
17 | hg up 1 |
|
17 | hg up 1 | |
18 |
echo |
|
18 | echo e >> a | |
19 | hg commit -me |
|
19 | hg commit -me | |
20 |
|
20 | |||
21 | hg up 1 |
|
21 | hg up 1 | |
22 | echo % should fail because not at a head |
|
22 | echo % should fail because not at a head | |
23 | hg merge |
|
23 | hg merge | |
24 |
|
24 | |||
25 | hg up |
|
25 | hg up | |
26 | echo % should fail because \> 2 heads |
|
26 | echo % should fail because \> 2 heads | |
|
27 | export HGMERGE=internal:other | |||
27 | hg merge |
|
28 | hg merge | |
28 |
|
29 | |||
29 | echo % should succeed |
|
30 | echo % should succeed | |
30 | hg merge 2 |
|
31 | hg merge 2 | |
31 | hg commit -mm1 |
|
32 | hg commit -mm1 | |
32 |
|
33 | |||
33 | echo % should succeed - 2 heads |
|
34 | echo % should succeed - 2 heads | |
34 | hg merge -P |
|
35 | hg merge -P | |
35 | hg merge |
|
36 | hg merge | |
36 | hg commit -mm2 |
|
37 | hg commit -mm2 | |
37 |
|
38 | |||
38 | echo % should fail because at tip |
|
39 | echo % should fail because at tip | |
39 | hg merge |
|
40 | hg merge | |
40 |
|
41 | |||
41 | hg up 0 |
|
42 | hg up 0 | |
42 | echo % should fail because 1 head |
|
43 | echo % should fail because 1 head | |
43 | hg merge |
|
44 | hg merge | |
44 |
|
45 | |||
45 | hg up 3 |
|
46 | hg up 3 | |
46 |
echo |
|
47 | echo f >> a | |
47 | hg branch foobranch |
|
48 | hg branch foobranch | |
48 | hg commit -mf |
|
49 | hg commit -mf | |
49 | echo % should fail because merge with other branch |
|
50 | echo % should fail because merge with other branch | |
50 | hg merge |
|
51 | hg merge | |
51 |
|
52 | |||
52 | true |
|
53 | true |
@@ -1,36 +1,36 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | created new head |
|
3 | created new head | |
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 | created new head |
|
5 | created new head | |
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 | % should fail because not at a head |
|
7 | % should fail because not at a head | |
8 | abort: branch 'default' has 3 heads - please merge with an explicit rev |
|
8 | abort: branch 'default' has 3 heads - please merge with an explicit rev | |
9 | (run 'hg heads .' to see heads) |
|
9 | (run 'hg heads .' to see heads) | |
10 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 | % should fail because > 2 heads |
|
11 | % should fail because > 2 heads | |
12 | abort: branch 'default' has 3 heads - please merge with an explicit rev |
|
12 | abort: branch 'default' has 3 heads - please merge with an explicit rev | |
13 | (run 'hg heads .' to see heads) |
|
13 | (run 'hg heads .' to see heads) | |
14 | % should succeed |
|
14 | % should succeed | |
15 |
0 files updated, |
|
15 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
16 | (branch merge, don't forget to commit) |
|
16 | (branch merge, don't forget to commit) | |
17 | % should succeed - 2 heads |
|
17 | % should succeed - 2 heads | |
18 |
changeset: 3: |
|
18 | changeset: 3:ea9ff125ff88 | |
19 |
parent: 1: |
|
19 | parent: 1:1846eede8b68 | |
20 | user: test |
|
20 | user: test | |
21 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
21 | date: Thu Jan 01 00:00:00 1970 +0000 | |
22 | summary: d |
|
22 | summary: d | |
23 |
|
23 | |||
24 |
0 files updated, |
|
24 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
25 | (branch merge, don't forget to commit) |
|
25 | (branch merge, don't forget to commit) | |
26 | % should fail because at tip |
|
26 | % should fail because at tip | |
27 | abort: there is nothing to merge |
|
27 | abort: there is nothing to merge | |
28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
29 | % should fail because 1 head |
|
29 | % should fail because 1 head | |
30 | abort: there is nothing to merge - use "hg update" instead |
|
30 | abort: there is nothing to merge - use "hg update" instead | |
31 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
31 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
32 | marked working directory as branch foobranch |
|
32 | marked working directory as branch foobranch | |
33 | created new head |
|
33 | created new head | |
34 | % should fail because merge with other branch |
|
34 | % should fail because merge with other branch | |
35 | abort: branch 'foobranch' has one head - please merge with an explicit rev |
|
35 | abort: branch 'foobranch' has one head - please merge with an explicit rev | |
36 | (run 'hg heads' to see all heads) |
|
36 | (run 'hg heads' to see all heads) |
General Comments 0
You need to be logged in to leave comments.
Login now