Fossil SCM
Fix revert tests 5 and 6 so they aren't carbon copies. Minor comment cleanup
Commit
1a5ac30583069627b229775fbfa7ecb7b25208b2
Parent
eef34741a998489…
1 file changed
+5
-4
+5
-4
| --- test/revert.test | ||
| +++ test/revert.test | ||
| @@ -7,13 +7,14 @@ | ||
| 7 | 7 | puts res=$res |
| 8 | 8 | if {![regexp {use --repository} $res]} { |
| 9 | 9 | puts stderr "Cannot run this test within an open checkout" |
| 10 | 10 | return |
| 11 | 11 | } |
| 12 | -# | |
| 12 | + | |
| 13 | 13 | # Fossil will write data on $HOME, running 'fossil new' here. |
| 14 | 14 | # We need not to clutter the $HOME of the test caller. |
| 15 | +# | |
| 15 | 16 | set env(HOME) [pwd] |
| 16 | 17 | |
| 17 | 18 | |
| 18 | 19 | # Normalize file status lists (like those returned by 'fossil changes') |
| 19 | 20 | # so they can be compared using simple string comparison |
| @@ -113,11 +114,11 @@ | ||
| 113 | 114 | EDITED f2 |
| 114 | 115 | RENAMED f3n |
| 115 | 116 | } -addremove { |
| 116 | 117 | ADDED f0 |
| 117 | 118 | } -exists {f0 f2 f3n} -notexists f3 |
| 118 | -# | |
| 119 | + | |
| 119 | 120 | revert-test 3 f1 -changes { |
| 120 | 121 | ADDED f0 |
| 121 | 122 | EDITED f2 |
| 122 | 123 | RENAMED f3n |
| 123 | 124 | } -exists {f0 f1 f2 f3n} -notexists f3 |
| @@ -128,18 +129,18 @@ | ||
| 128 | 129 | RENAMED f3n |
| 129 | 130 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 130 | 131 | |
| 131 | 132 | # Both files involved in a rename are reverted regardless of which filename |
| 132 | 133 | # is used as an argument to 'fossil revert' |
| 133 | - | |
| 134 | +# | |
| 134 | 135 | revert-test 5 f3 -changes { |
| 135 | 136 | ADDED f0 |
| 136 | 137 | DELETED f1 |
| 137 | 138 | EDITED f2 |
| 138 | 139 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 139 | 140 | |
| 140 | -revert-test 6 f3 -changes { | |
| 141 | +revert-test 6 f3n -changes { | |
| 141 | 142 | ADDED f0 |
| 142 | 143 | DELETED f1 |
| 143 | 144 | EDITED f2 |
| 144 | 145 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 145 | 146 | |
| 146 | 147 |
| --- test/revert.test | |
| +++ test/revert.test | |
| @@ -7,13 +7,14 @@ | |
| 7 | puts res=$res |
| 8 | if {![regexp {use --repository} $res]} { |
| 9 | puts stderr "Cannot run this test within an open checkout" |
| 10 | return |
| 11 | } |
| 12 | # |
| 13 | # Fossil will write data on $HOME, running 'fossil new' here. |
| 14 | # We need not to clutter the $HOME of the test caller. |
| 15 | set env(HOME) [pwd] |
| 16 | |
| 17 | |
| 18 | # Normalize file status lists (like those returned by 'fossil changes') |
| 19 | # so they can be compared using simple string comparison |
| @@ -113,11 +114,11 @@ | |
| 113 | EDITED f2 |
| 114 | RENAMED f3n |
| 115 | } -addremove { |
| 116 | ADDED f0 |
| 117 | } -exists {f0 f2 f3n} -notexists f3 |
| 118 | # |
| 119 | revert-test 3 f1 -changes { |
| 120 | ADDED f0 |
| 121 | EDITED f2 |
| 122 | RENAMED f3n |
| 123 | } -exists {f0 f1 f2 f3n} -notexists f3 |
| @@ -128,18 +129,18 @@ | |
| 128 | RENAMED f3n |
| 129 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 130 | |
| 131 | # Both files involved in a rename are reverted regardless of which filename |
| 132 | # is used as an argument to 'fossil revert' |
| 133 | |
| 134 | revert-test 5 f3 -changes { |
| 135 | ADDED f0 |
| 136 | DELETED f1 |
| 137 | EDITED f2 |
| 138 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 139 | |
| 140 | revert-test 6 f3 -changes { |
| 141 | ADDED f0 |
| 142 | DELETED f1 |
| 143 | EDITED f2 |
| 144 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 145 | |
| 146 |
| --- test/revert.test | |
| +++ test/revert.test | |
| @@ -7,13 +7,14 @@ | |
| 7 | puts res=$res |
| 8 | if {![regexp {use --repository} $res]} { |
| 9 | puts stderr "Cannot run this test within an open checkout" |
| 10 | return |
| 11 | } |
| 12 | |
| 13 | # Fossil will write data on $HOME, running 'fossil new' here. |
| 14 | # We need not to clutter the $HOME of the test caller. |
| 15 | # |
| 16 | set env(HOME) [pwd] |
| 17 | |
| 18 | |
| 19 | # Normalize file status lists (like those returned by 'fossil changes') |
| 20 | # so they can be compared using simple string comparison |
| @@ -113,11 +114,11 @@ | |
| 114 | EDITED f2 |
| 115 | RENAMED f3n |
| 116 | } -addremove { |
| 117 | ADDED f0 |
| 118 | } -exists {f0 f2 f3n} -notexists f3 |
| 119 | |
| 120 | revert-test 3 f1 -changes { |
| 121 | ADDED f0 |
| 122 | EDITED f2 |
| 123 | RENAMED f3n |
| 124 | } -exists {f0 f1 f2 f3n} -notexists f3 |
| @@ -128,18 +129,18 @@ | |
| 129 | RENAMED f3n |
| 130 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 131 | |
| 132 | # Both files involved in a rename are reverted regardless of which filename |
| 133 | # is used as an argument to 'fossil revert' |
| 134 | # |
| 135 | revert-test 5 f3 -changes { |
| 136 | ADDED f0 |
| 137 | DELETED f1 |
| 138 | EDITED f2 |
| 139 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 140 | |
| 141 | revert-test 6 f3n -changes { |
| 142 | ADDED f0 |
| 143 | DELETED f1 |
| 144 | EDITED f2 |
| 145 | } -exists {f0 f2 f3} -notexists {f1 f3n} |
| 146 | |
| 147 |