tests/test-add.out
author Kirill Smelkov <kirr@landau.phys.spbu.ru>
Sat, 13 Oct 2007 15:25:11 +0400
changeset 5462 91a522a69c13
parent 5205 212de429e000
permissions -rw-r--r--
convert: svn -- fix tags handling They were simply not detected.

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
warning: conflicts during merge.
merging a
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 2
  hg merge 1
M a
% should fail
a already tracked!
M a
% issue683
R a
M a