Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-revert.out @ 2043:968f036f93a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor fix for revert: No need to make a backup when forgetting added files. echo foo > foo && hg add foo && hg revert foo creates foo.orig, though foo is not changed or deleted.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Apr 2006 21:01:33 +0200
parents a514c7509fa9
children 1e82f2337498
comparison
equal deleted inserted replaced
2042:a514c7509fa9 2043:968f036f93a4
11 A b 11 A b
12 R a 12 R a
13 %% should show b added, copy saved, and c modified 13 %% should show b added, copy saved, and c modified
14 M c 14 M c
15 A b 15 A b
16 %% should show b unknown, b.orig unknown, and c modified 16 %% should show b unknown, and c modified
17 M c 17 M c
18 ? b 18 ? b
19 ? b.orig 19 %% should show unknown: b
20 %% should show unknown: b b.orig
21 ? b 20 ? b
22 ? b.orig 21 %% should show a b c e
23 %% should show a b b.orig c e
24 a 22 a
25 b 23 b
26 b.orig
27 c 24 c
28 e 25 e
29 %% should verbosely save backup to e.orig 26 %% should verbosely save backup to e.orig
30 saving current version of e as e.orig 27 saving current version of e as e.orig
31 reverting e 28 reverting e
38 file not managed: q 35 file not managed: q
39 %% should say file not found 36 %% should say file not found
40 notfound: No such file in rev 095eacd0c0d7 37 notfound: No such file in rev 095eacd0c0d7
41 A z 38 A z
42 ? b 39 ? b
43 ? b.orig
44 ? e.orig 40 ? e.orig
45 %% should add a, forget z 41 %% should add a, forget z
46 adding a 42 adding a
47 forgetting z 43 forgetting z
48 %% should forget a 44 %% should forget a