tests/test-add.out
author Matt Mackall <mpm@selenic.com>
Fri, 11 Apr 2008 12:52:56 -0500
changeset 6518 92ccccb55ba3
parent 6336 4b0c9c674707
child 7821 9fe7e6acf525
permissions -rw-r--r--
resolve: new command - add basic resolve command functionality - point failed update and merge at resolve

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