Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-add.out @ 5205:212de429e000
make hg add of a removed file unremove the file
if a file was removed, hg add shouldn't mark the file
as added, but as normal
see issue683
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 21 Aug 2007 02:13:32 +0200 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
5204:6a1d2dd96b8e | 5205:212de429e000 |
---|---|
1 adding a | |
2 ? a | |
3 adding a | |
4 A a | |
5 A a | |
6 ? b | |
7 A a | |
8 A b | |
9 % should fail | |
10 b already tracked! | |
11 A a | |
12 A b | |
13 % should fail | |
14 a already tracked! | |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
16 warning: conflicts during merge. | |
17 merging a | |
18 merging a failed! | |
19 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
20 There are unresolved merges, you can redo the full merge using: | |
21 hg update -C 2 | |
22 hg merge 1 | |
23 M a | |
24 % should fail | |
25 a already tracked! | |
26 M a | |
27 % issue683 | |
28 R a | |
29 M a |