Mercurial > hg

annotate tests/test-issue842.out @ 10461:0add1e265ac2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: merge default into stable
author Martin Geisler <mg@lazybytes.net>
date Sun, 14 Feb 2010 13:29:11 +0100
parents 4b0c9c674707
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
1 adding a
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
3 % should issue warning
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
4 adding a
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
5 created new head
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
7 % should not issue warning
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
8 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
9 marked working directory as branch testing
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
10 % should not issue warning