tests/test-add.out
author Henrik Stuart <henrik.stuart at edlund.dk>
Wed, 08 Apr 2009 19:32:16 +0200
changeset 8025 1280934dd2dd
parent 7821 9fe7e6acf525
child 8679 32537b12e091
permissions -rw-r--r--
patchbomb: Support initial in-reply-to header This allows follow-up/revised patches to appear properly threaded in mail readers and in the archives, reducing noise.

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 or 'hg up --clean' to abandon
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