tests/test-add.out
author Ori Avtalion <ori@avtalion.name>
Sat, 15 May 2010 00:34:07 +0300
changeset 11180 4b02fc71bbba
parent 9468 b2310903c462
permissions -rw-r--r--
Fix hg heads -r flag documentation The command arguments are "[-ac] [-r STARTREV] [REV]..."

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 update -C' 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