Fossil SCM
In the 'revert' test, adjust formatting of expected results containing 'DELETE', 'REVERT', and 'UNMANAGE', also to account for recent code changes.
Commit
1338b4198d31be6c849f4a509d31db5fa768d3ef
Parent
11444dbec7c2e25…
1 file changed
+18
-18
+18
-18
| --- test/revert.test | ||
| +++ test/revert.test | ||
| @@ -70,41 +70,41 @@ | ||
| 70 | 70 | fossil mv f3 f3n |
| 71 | 71 | |
| 72 | 72 | # Test 'fossil revert' with no arguments |
| 73 | 73 | # |
| 74 | 74 | revert-test 1-1 {} { |
| 75 | - UNMANAGE: f0 | |
| 76 | - REVERTED: f1 | |
| 77 | - REVERTED: f2 | |
| 78 | - REVERTED: f3 | |
| 79 | - DELETE: f3n | |
| 75 | + UNMANAGE f0 | |
| 76 | + REVERT f1 | |
| 77 | + REVERT f2 | |
| 78 | + REVERT f3 | |
| 79 | + DELETE f3n | |
| 80 | 80 | } -addremove { |
| 81 | 81 | ADDED f0 |
| 82 | 82 | } -exists {f0 f1 f2 f3} -notexists f3n |
| 83 | 83 | |
| 84 | 84 | # Test with a single filename argument |
| 85 | 85 | # |
| 86 | 86 | revert-test 1-2 f0 { |
| 87 | - UNMANAGE: f0 | |
| 87 | + UNMANAGE f0 | |
| 88 | 88 | } -changes { |
| 89 | 89 | DELETED f1 |
| 90 | 90 | EDITED f2 |
| 91 | 91 | RENAMED f3n |
| 92 | 92 | } -addremove { |
| 93 | 93 | ADDED f0 |
| 94 | 94 | } -exists {f0 f2 f3n} -notexists f3 |
| 95 | 95 | |
| 96 | 96 | revert-test 1-3 f1 { |
| 97 | - REVERTED: f1 | |
| 97 | + REVERT f1 | |
| 98 | 98 | } -changes { |
| 99 | 99 | ADDED f0 |
| 100 | 100 | EDITED f2 |
| 101 | 101 | RENAMED f3n |
| 102 | 102 | } -exists {f0 f1 f2 f3n} -notexists f3 |
| 103 | 103 | |
| 104 | 104 | revert-test 1-4 f2 { |
| 105 | - REVERTED: f2 | |
| 105 | + REVERT f2 | |
| 106 | 106 | } -changes { |
| 107 | 107 | ADDED f0 |
| 108 | 108 | DELETED f1 |
| 109 | 109 | RENAMED f3n |
| 110 | 110 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| @@ -111,34 +111,34 @@ | ||
| 111 | 111 | |
| 112 | 112 | # Both files involved in a rename are reverted regardless of which filename |
| 113 | 113 | # is used as an argument to 'fossil revert' |
| 114 | 114 | # |
| 115 | 115 | revert-test 1-5 f3 { |
| 116 | - REVERTED: f3 | |
| 117 | - DELETE: f3n | |
| 116 | + REVERT f3 | |
| 117 | + DELETE f3n | |
| 118 | 118 | } -changes { |
| 119 | 119 | ADDED f0 |
| 120 | 120 | DELETED f1 |
| 121 | 121 | EDITED f2 |
| 122 | 122 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 123 | 123 | |
| 124 | 124 | revert-test 1-6 f3n { |
| 125 | - REVERTED: f3 | |
| 126 | - DELETE: f3n | |
| 125 | + REVERT f3 | |
| 126 | + DELETE f3n | |
| 127 | 127 | } -changes { |
| 128 | 128 | ADDED f0 |
| 129 | 129 | DELETED f1 |
| 130 | 130 | EDITED f2 |
| 131 | 131 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 132 | 132 | |
| 133 | 133 | # Test with multiple filename arguments |
| 134 | 134 | # |
| 135 | 135 | revert-test 1-7 {f0 f2 f3n} { |
| 136 | - UNMANAGE: f0 | |
| 137 | - REVERTED: f2 | |
| 138 | - REVERTED: f3 | |
| 139 | - DELETE: f3n | |
| 136 | + UNMANAGE f0 | |
| 137 | + REVERT f2 | |
| 138 | + REVERT f3 | |
| 139 | + DELETE f3n | |
| 140 | 140 | } -changes { |
| 141 | 141 | DELETED f1 |
| 142 | 142 | } -addremove { |
| 143 | 143 | ADDED f0 |
| 144 | 144 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| @@ -156,8 +156,8 @@ | ||
| 156 | 156 | fossil mv f1 f1n |
| 157 | 157 | write_file f1 "f1b" |
| 158 | 158 | fossil add f1 |
| 159 | 159 | |
| 160 | 160 | revert-test 2-1 {} { |
| 161 | - REVERTED: f1 | |
| 162 | - DELETE: f1n | |
| 161 | + REVERT f1 | |
| 162 | + DELETE f1n | |
| 163 | 163 | } -exists {f1} -notexists {f1n} |
| 164 | 164 |
| --- test/revert.test | |
| +++ test/revert.test | |
| @@ -70,41 +70,41 @@ | |
| 70 | fossil mv f3 f3n |
| 71 | |
| 72 | # Test 'fossil revert' with no arguments |
| 73 | # |
| 74 | revert-test 1-1 {} { |
| 75 | UNMANAGE: f0 |
| 76 | REVERTED: f1 |
| 77 | REVERTED: f2 |
| 78 | REVERTED: f3 |
| 79 | DELETE: f3n |
| 80 | } -addremove { |
| 81 | ADDED f0 |
| 82 | } -exists {f0 f1 f2 f3} -notexists f3n |
| 83 | |
| 84 | # Test with a single filename argument |
| 85 | # |
| 86 | revert-test 1-2 f0 { |
| 87 | UNMANAGE: f0 |
| 88 | } -changes { |
| 89 | DELETED f1 |
| 90 | EDITED f2 |
| 91 | RENAMED f3n |
| 92 | } -addremove { |
| 93 | ADDED f0 |
| 94 | } -exists {f0 f2 f3n} -notexists f3 |
| 95 | |
| 96 | revert-test 1-3 f1 { |
| 97 | REVERTED: f1 |
| 98 | } -changes { |
| 99 | ADDED f0 |
| 100 | EDITED f2 |
| 101 | RENAMED f3n |
| 102 | } -exists {f0 f1 f2 f3n} -notexists f3 |
| 103 | |
| 104 | revert-test 1-4 f2 { |
| 105 | REVERTED: f2 |
| 106 | } -changes { |
| 107 | ADDED f0 |
| 108 | DELETED f1 |
| 109 | RENAMED f3n |
| 110 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| @@ -111,34 +111,34 @@ | |
| 111 | |
| 112 | # Both files involved in a rename are reverted regardless of which filename |
| 113 | # is used as an argument to 'fossil revert' |
| 114 | # |
| 115 | revert-test 1-5 f3 { |
| 116 | REVERTED: f3 |
| 117 | DELETE: f3n |
| 118 | } -changes { |
| 119 | ADDED f0 |
| 120 | DELETED f1 |
| 121 | EDITED f2 |
| 122 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 123 | |
| 124 | revert-test 1-6 f3n { |
| 125 | REVERTED: f3 |
| 126 | DELETE: f3n |
| 127 | } -changes { |
| 128 | ADDED f0 |
| 129 | DELETED f1 |
| 130 | EDITED f2 |
| 131 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 132 | |
| 133 | # Test with multiple filename arguments |
| 134 | # |
| 135 | revert-test 1-7 {f0 f2 f3n} { |
| 136 | UNMANAGE: f0 |
| 137 | REVERTED: f2 |
| 138 | REVERTED: f3 |
| 139 | DELETE: f3n |
| 140 | } -changes { |
| 141 | DELETED f1 |
| 142 | } -addremove { |
| 143 | ADDED f0 |
| 144 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| @@ -156,8 +156,8 @@ | |
| 156 | fossil mv f1 f1n |
| 157 | write_file f1 "f1b" |
| 158 | fossil add f1 |
| 159 | |
| 160 | revert-test 2-1 {} { |
| 161 | REVERTED: f1 |
| 162 | DELETE: f1n |
| 163 | } -exists {f1} -notexists {f1n} |
| 164 |
| --- test/revert.test | |
| +++ test/revert.test | |
| @@ -70,41 +70,41 @@ | |
| 70 | fossil mv f3 f3n |
| 71 | |
| 72 | # Test 'fossil revert' with no arguments |
| 73 | # |
| 74 | revert-test 1-1 {} { |
| 75 | UNMANAGE f0 |
| 76 | REVERT f1 |
| 77 | REVERT f2 |
| 78 | REVERT f3 |
| 79 | DELETE f3n |
| 80 | } -addremove { |
| 81 | ADDED f0 |
| 82 | } -exists {f0 f1 f2 f3} -notexists f3n |
| 83 | |
| 84 | # Test with a single filename argument |
| 85 | # |
| 86 | revert-test 1-2 f0 { |
| 87 | UNMANAGE f0 |
| 88 | } -changes { |
| 89 | DELETED f1 |
| 90 | EDITED f2 |
| 91 | RENAMED f3n |
| 92 | } -addremove { |
| 93 | ADDED f0 |
| 94 | } -exists {f0 f2 f3n} -notexists f3 |
| 95 | |
| 96 | revert-test 1-3 f1 { |
| 97 | REVERT f1 |
| 98 | } -changes { |
| 99 | ADDED f0 |
| 100 | EDITED f2 |
| 101 | RENAMED f3n |
| 102 | } -exists {f0 f1 f2 f3n} -notexists f3 |
| 103 | |
| 104 | revert-test 1-4 f2 { |
| 105 | REVERT f2 |
| 106 | } -changes { |
| 107 | ADDED f0 |
| 108 | DELETED f1 |
| 109 | RENAMED f3n |
| 110 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| @@ -111,34 +111,34 @@ | |
| 111 | |
| 112 | # Both files involved in a rename are reverted regardless of which filename |
| 113 | # is used as an argument to 'fossil revert' |
| 114 | # |
| 115 | revert-test 1-5 f3 { |
| 116 | REVERT f3 |
| 117 | DELETE f3n |
| 118 | } -changes { |
| 119 | ADDED f0 |
| 120 | DELETED f1 |
| 121 | EDITED f2 |
| 122 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 123 | |
| 124 | revert-test 1-6 f3n { |
| 125 | REVERT f3 |
| 126 | DELETE f3n |
| 127 | } -changes { |
| 128 | ADDED f0 |
| 129 | DELETED f1 |
| 130 | EDITED f2 |
| 131 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 132 | |
| 133 | # Test with multiple filename arguments |
| 134 | # |
| 135 | revert-test 1-7 {f0 f2 f3n} { |
| 136 | UNMANAGE f0 |
| 137 | REVERT f2 |
| 138 | REVERT f3 |
| 139 | DELETE f3n |
| 140 | } -changes { |
| 141 | DELETED f1 |
| 142 | } -addremove { |
| 143 | ADDED f0 |
| 144 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| @@ -156,8 +156,8 @@ | |
| 156 | fossil mv f1 f1n |
| 157 | write_file f1 "f1b" |
| 158 | fossil add f1 |
| 159 | |
| 160 | revert-test 2-1 {} { |
| 161 | REVERT f1 |
| 162 | DELETE f1n |
| 163 | } -exists {f1} -notexists {f1n} |
| 164 |