tests/test-issue842.out
author Matt Mackall <mpm@selenic.com>
Tue, 11 May 2010 17:11:40 -0500
branchstable
changeset 11160 fdcf80f26604
parent 6336 4b0c9c674707
permissions -rw-r--r--
Merge with i18n
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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