Show More
@@ -0,0 +1,34 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | # | |||
|
3 | # test for branch handling | |||
|
4 | # | |||
|
5 | # XXX: need more tests | |||
|
6 | ||||
|
7 | hg init | |||
|
8 | echo a > a | |||
|
9 | echo b > b | |||
|
10 | hg ci -A -m 0 -d "1000000 0" | |||
|
11 | echo aa > a | |||
|
12 | echo bb > b | |||
|
13 | hg ci -m 1 -d "1000000 0" | |||
|
14 | hg tag -l foo | |||
|
15 | hg update 0 | |||
|
16 | hg parents -b | |||
|
17 | ||||
|
18 | # test update | |||
|
19 | hg update -b foo | |||
|
20 | hg parents | |||
|
21 | ||||
|
22 | # test merge | |||
|
23 | hg update 0 | |||
|
24 | echo c > c | |||
|
25 | hg ci -A -m 0.0 -d "1000000 0" | |||
|
26 | hg merge -b foo | |||
|
27 | hg parents -b | |||
|
28 | ||||
|
29 | # re-test with more branches | |||
|
30 | hg update -C 0 | |||
|
31 | echo d > d | |||
|
32 | hg ci -A -m 0.0 -d "1000000 0" | |||
|
33 | hg merge -b foo | |||
|
34 | hg parents -b |
@@ -0,0 +1,55 b'' | |||||
|
1 | adding a | |||
|
2 | adding b | |||
|
3 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
4 | changeset: 0:b544c4ac4389 | |||
|
5 | user: test | |||
|
6 | date: Mon Jan 12 13:46:40 1970 +0000 | |||
|
7 | summary: 0 | |||
|
8 | ||||
|
9 | Using head f4ac749470f2 for branch foo | |||
|
10 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
11 | changeset: 1:f4ac749470f2 | |||
|
12 | tag: foo | |||
|
13 | tag: tip | |||
|
14 | user: test | |||
|
15 | date: Mon Jan 12 13:46:40 1970 +0000 | |||
|
16 | summary: 1 | |||
|
17 | ||||
|
18 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
19 | adding c | |||
|
20 | Using head f4ac749470f2 for branch foo | |||
|
21 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
22 | (branch merge, don't forget to commit) | |||
|
23 | changeset: 2:1505d56ee00e | |||
|
24 | tag: tip | |||
|
25 | parent: 0:b544c4ac4389 | |||
|
26 | user: test | |||
|
27 | date: Mon Jan 12 13:46:40 1970 +0000 | |||
|
28 | summary: 0.0 | |||
|
29 | ||||
|
30 | changeset: 1:f4ac749470f2 | |||
|
31 | tag: foo | |||
|
32 | branch: foo | |||
|
33 | user: test | |||
|
34 | date: Mon Jan 12 13:46:40 1970 +0000 | |||
|
35 | summary: 1 | |||
|
36 | ||||
|
37 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
38 | adding d | |||
|
39 | Using head f4ac749470f2 for branch foo | |||
|
40 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
41 | (branch merge, don't forget to commit) | |||
|
42 | changeset: 3:53b72df12ae5 | |||
|
43 | tag: tip | |||
|
44 | parent: 0:b544c4ac4389 | |||
|
45 | user: test | |||
|
46 | date: Mon Jan 12 13:46:40 1970 +0000 | |||
|
47 | summary: 0.0 | |||
|
48 | ||||
|
49 | changeset: 1:f4ac749470f2 | |||
|
50 | tag: foo | |||
|
51 | branch: foo | |||
|
52 | user: test | |||
|
53 | date: Mon Jan 12 13:46:40 1970 +0000 | |||
|
54 | summary: 1 | |||
|
55 |
@@ -1940,7 +1940,7 b' def merge(ui, repo, node=None, force=Non' | |||||
1940 | revision to merge with must be provided. |
|
1940 | revision to merge with must be provided. | |
1941 | """ |
|
1941 | """ | |
1942 |
|
1942 | |||
1943 | if node: |
|
1943 | if node or branch: | |
1944 | node = _lookup(repo, node, branch) |
|
1944 | node = _lookup(repo, node, branch) | |
1945 | else: |
|
1945 | else: | |
1946 | heads = repo.heads() |
|
1946 | heads = repo.heads() |
General Comments 0
You need to be logged in to leave comments.
Login now