Mercurial > hg
annotate tests/test-merge-closedheads.out @ 11733:b43cfaf571d6
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 02 Aug 2010 10:55:51 -0500 |
parents | ee876e42dd74 |
children |
rev | line source |
---|---|
8694
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
1 adding foo |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
2 adding bar |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
3 adding baz |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
5 created new head |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
7 created new head |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
8 % fail with three heads |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
10 abort: branch 'default' has 3 heads - please merge with an explicit rev |
10355
a5576908b589
merge: add hints about the use of 'hg heads' to find the rev to merge
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8694
diff
changeset
|
11 (run 'hg heads .' to see heads) |
8694
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
12 % close one of the heads |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
13 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
14 % succeed with two open heads |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
15 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
16 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
18 (branch merge, don't forget to commit) |
11516
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
19 % hg update -C 8 |
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
21 % hg branch some-branch |
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
22 marked working directory as branch some-branch |
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
23 % hg commit |
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
24 % hg commit --close-branch |
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
25 % hg update default |
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
27 % hg merge some-branch |
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
28 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
29 (branch merge, don't forget to commit) |
ee876e42dd74
test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents:
10355
diff
changeset
|
30 % hg commit (no reopening of some-branch) |