Show More
@@ -0,0 +1,26 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | hg init t | |||
|
4 | cd t | |||
|
5 | ||||
|
6 | echo foo > a | |||
|
7 | hg add a | |||
|
8 | hg ci -m "initial" -d "0 0" | |||
|
9 | echo foo > .hg/branch | |||
|
10 | hg ci -m "add branch name" -d "0 0" | |||
|
11 | echo bar > .hg/branch | |||
|
12 | hg ci -m "change branch name" -d "0 0" | |||
|
13 | rm .hg/branch | |||
|
14 | hg ci -m "clear branch name" -d "0 0" | |||
|
15 | ||||
|
16 | hg co foo | |||
|
17 | cat .hg/branch | |||
|
18 | echo bleah > a | |||
|
19 | hg ci -m "modify a branch" -d "0 0" | |||
|
20 | ||||
|
21 | hg merge | |||
|
22 | cat .hg/branch | |||
|
23 | HG_MERGE=true hg ci -m "merge" -d "0 0" | |||
|
24 | hg log | |||
|
25 | ||||
|
26 |
@@ -0,0 +1,43 b'' | |||||
|
1 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
2 | foo | |||
|
3 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
4 | (branch merge, don't forget to commit) | |||
|
5 | foo | |||
|
6 | changeset: 5:dc140083783b | |||
|
7 | branch: foo | |||
|
8 | tag: tip | |||
|
9 | parent: 4:98d14f698afe | |||
|
10 | parent: 3:9d567d0b51f9 | |||
|
11 | user: test | |||
|
12 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
13 | summary: merge | |||
|
14 | ||||
|
15 | changeset: 4:98d14f698afe | |||
|
16 | branch: foo | |||
|
17 | parent: 1:0079f24813e2 | |||
|
18 | user: test | |||
|
19 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
20 | summary: modify a branch | |||
|
21 | ||||
|
22 | changeset: 3:9d567d0b51f9 | |||
|
23 | user: test | |||
|
24 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
25 | summary: clear branch name | |||
|
26 | ||||
|
27 | changeset: 2:ed2bbf4e0102 | |||
|
28 | branch: bar | |||
|
29 | user: test | |||
|
30 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
31 | summary: change branch name | |||
|
32 | ||||
|
33 | changeset: 1:0079f24813e2 | |||
|
34 | branch: foo | |||
|
35 | user: test | |||
|
36 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
37 | summary: add branch name | |||
|
38 | ||||
|
39 | changeset: 0:db01e8ea3388 | |||
|
40 | user: test | |||
|
41 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
42 | summary: initial | |||
|
43 |
General Comments 0
You need to be logged in to leave comments.
Login now