comparison tests/test-revert.out @ 6031:7383384793fb

revert: don't assume ignored files will be returned in the unknown list That's just an artifact of the current implementation, and I'll change that soon. Bonus points: - we don't care about the unknown list at all - we don't print an extra message if we try to revert a removed file that is not present in the target revision
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 08 Feb 2008 18:07:55 -0200
parents bfd73b567b3d
children a1ebd5cd7e55
comparison
equal deleted inserted replaced
6030:d0dbae32517c 6031:7383384793fb
35 %% should say file not found 35 %% should say file not found
36 notfound: No such file in rev 095eacd0c0d7 36 notfound: No such file in rev 095eacd0c0d7
37 A z 37 A z
38 ? b 38 ? b
39 ? e.orig 39 ? e.orig
40 %% should add a, forget z 40 %% should add a, remove d, forget z
41 adding a 41 adding a
42 removing d
42 forgetting z 43 forgetting z
43 %% should forget a 44 %% should forget a, undelete d
44 forgetting a 45 forgetting a
46 undeleting d
45 %% should silently add a 47 %% should silently add a
46 A a 48 A a
47 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 49 R d
50 %% should silently keep d removed
51 R d
52 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
48 reverting c 53 reverting c
49 %% should print non-executable 54 %% should print non-executable
50 non-executable 55 non-executable
51 reverting c 56 reverting c
52 %% should print executable 57 %% should print executable
63 reverting b/b 68 reverting b/b
64 forgetting newdir/newfile 69 forgetting newdir/newfile
65 reverting b/b 70 reverting b/b
66 % reverting a rename target should revert the source 71 % reverting a rename target should revert the source
67 ? newa 72 ? newa
73 %% 4 ignored files (we will add/commit everything)
74 ? ignoreddir/file
75 ? ignoreddir/removed
76 I ignored
77 I removed
78 %% should revert ignored* and undelete *removed
79 reverting ignored
80 reverting ignoreddir/file
81 undeleting ignoreddir/removed
82 undeleting removed
83 %% should silently revert the named files