view tests/test-add.out @ 6922:1ec2d227a521

hgweb: fix WSGI iterators handling in CGI adapter (issue1254)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 21 Aug 2008 10:55:24 +0200
parents 92ccccb55ba3
children 9fe7e6acf525
line wrap: on
line source

adding 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
M a
? a.orig
% should fail
a already tracked!
M a
? a.orig
% issue683
R a
? a.orig
M a
? a.orig
c does not exist!
d does not exist!
M a
A c
? a.orig