view tests/test-add.out @ 9041:6e5e548452de

test-gpg: suppress secure memory warning Some platforms (Solaris for one) does not support secure memory and would give a warning.
author David Champion <dgc@uchicago.edu>
date Sun, 05 Jul 2009 13:59:25 -0500
parents b9a8b616521d
children b2310903c462
line wrap: on
line source

adding a
? a
adding a
A a
adding a
A a
A a
? b
A a
A b
% should fail
b already tracked!
A a
A b
% should fail
a already tracked!
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
M a
? a.orig
% should fail
a already tracked!
M a
? a.orig
% issue683
? a.orig
R a
? a.orig
M a
? a.orig
c: No such file or directory
d: No such file or directory
M a
A c
? a.orig