Mercurial > hg
annotate tests/test-merge-closedheads.out @ 9014:87c05a78e588
test python hook configured with python:[file]:[hook] syntax
Adds a test for python hooks configured with python:[file]:[hook] syntax
in .hgrc. Increases the test coverage for mercurial/hook from 92% (79/85)
to 96% (82/85).
author | Henri Wiechers <hwiechers@gmail.com> |
---|---|
date | Fri, 26 Jun 2009 14:42:05 +0200 |
parents | ca8d05e1f1d1 |
children | a5576908b589 |
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 |
ca8d05e1f1d1
localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff
changeset
|
11 % 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
|
12 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
|
13 % 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
|
14 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
|
15 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
|
16 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
|
17 (branch merge, don't forget to commit) |