Fossil SCM
Fix stash.test: changed markers for RENAMED files.
Commit
cb9106b2800a68d027e35923fdc5fd98fe84ca418a1cfae74967f3c682cc2bb4
Parent
1d615c9b6c18c24…
1 file changed
+4
-4
+4
-4
| --- test/stash.test | ||
| +++ test/stash.test | ||
| @@ -185,11 +185,11 @@ | ||
| 185 | 185 | ADDED f0 |
| 186 | 186 | } -changes { |
| 187 | 187 | ADDED f0 |
| 188 | 188 | MISSING f1 |
| 189 | 189 | EDITED f2 |
| 190 | - RENAMED f3n | |
| 190 | + RENAMED f3 -> f3n | |
| 191 | 191 | } -addremove { |
| 192 | 192 | DELETED f1 |
| 193 | 193 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 194 | 194 | |
| 195 | 195 | # Confirm there is no longer a stash saved |
| @@ -292,11 +292,11 @@ | ||
| 292 | 292 | fossil mv --hard f2 f2n |
| 293 | 293 | test_result_state stash-3-2-mv "mv --hard f2 f2n" [concat { |
| 294 | 294 | RENAME f2 f2n |
| 295 | 295 | MOVED_FILE} [file normalize f2] { |
| 296 | 296 | }] -changes { |
| 297 | - RENAMED f2n | |
| 297 | + RENAMED f2 -> f2n | |
| 298 | 298 | } -addremove { |
| 299 | 299 | } -exists {f1 f2n} -notexists {f2} |
| 300 | 300 | |
| 301 | 301 | stash-test 3-2 {save -m f2n} { |
| 302 | 302 | REVERT f2 |
| @@ -307,11 +307,11 @@ | ||
| 307 | 307 | test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]} |
| 308 | 308 | stash-test 3-2-pop {pop} { |
| 309 | 309 | UPDATE f1 |
| 310 | 310 | UPDATE f2n |
| 311 | 311 | } -changes { |
| 312 | - RENAMED f2n | |
| 312 | + RENAMED f2 -> f2n | |
| 313 | 313 | } -addremove { |
| 314 | 314 | } -exists {f1 f2n} -notexists {f2} |
| 315 | 315 | |
| 316 | 316 | |
| 317 | 317 | |
| @@ -368,11 +368,11 @@ | ||
| 368 | 368 | stash-test 4-3 {snapshot -m "snap 3"} { |
| 369 | 369 | } -changes { |
| 370 | 370 | ADDED f0 |
| 371 | 371 | DELETED f1 |
| 372 | 372 | EDITED f2 |
| 373 | - RENAMED f3n | |
| 373 | + RENAMED f3 -> f3n | |
| 374 | 374 | } -addremove { |
| 375 | 375 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 376 | 376 | fossil stash diff |
| 377 | 377 | test stash-4-3-diff-CODE {!$::CODE} knownBug |
| 378 | 378 | fossil stash show |
| 379 | 379 |
| --- test/stash.test | |
| +++ test/stash.test | |
| @@ -185,11 +185,11 @@ | |
| 185 | ADDED f0 |
| 186 | } -changes { |
| 187 | ADDED f0 |
| 188 | MISSING f1 |
| 189 | EDITED f2 |
| 190 | RENAMED f3n |
| 191 | } -addremove { |
| 192 | DELETED f1 |
| 193 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 194 | |
| 195 | # Confirm there is no longer a stash saved |
| @@ -292,11 +292,11 @@ | |
| 292 | fossil mv --hard f2 f2n |
| 293 | test_result_state stash-3-2-mv "mv --hard f2 f2n" [concat { |
| 294 | RENAME f2 f2n |
| 295 | MOVED_FILE} [file normalize f2] { |
| 296 | }] -changes { |
| 297 | RENAMED f2n |
| 298 | } -addremove { |
| 299 | } -exists {f1 f2n} -notexists {f2} |
| 300 | |
| 301 | stash-test 3-2 {save -m f2n} { |
| 302 | REVERT f2 |
| @@ -307,11 +307,11 @@ | |
| 307 | test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]} |
| 308 | stash-test 3-2-pop {pop} { |
| 309 | UPDATE f1 |
| 310 | UPDATE f2n |
| 311 | } -changes { |
| 312 | RENAMED f2n |
| 313 | } -addremove { |
| 314 | } -exists {f1 f2n} -notexists {f2} |
| 315 | |
| 316 | |
| 317 | |
| @@ -368,11 +368,11 @@ | |
| 368 | stash-test 4-3 {snapshot -m "snap 3"} { |
| 369 | } -changes { |
| 370 | ADDED f0 |
| 371 | DELETED f1 |
| 372 | EDITED f2 |
| 373 | RENAMED f3n |
| 374 | } -addremove { |
| 375 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 376 | fossil stash diff |
| 377 | test stash-4-3-diff-CODE {!$::CODE} knownBug |
| 378 | fossil stash show |
| 379 |
| --- test/stash.test | |
| +++ test/stash.test | |
| @@ -185,11 +185,11 @@ | |
| 185 | ADDED f0 |
| 186 | } -changes { |
| 187 | ADDED f0 |
| 188 | MISSING f1 |
| 189 | EDITED f2 |
| 190 | RENAMED f3 -> f3n |
| 191 | } -addremove { |
| 192 | DELETED f1 |
| 193 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 194 | |
| 195 | # Confirm there is no longer a stash saved |
| @@ -292,11 +292,11 @@ | |
| 292 | fossil mv --hard f2 f2n |
| 293 | test_result_state stash-3-2-mv "mv --hard f2 f2n" [concat { |
| 294 | RENAME f2 f2n |
| 295 | MOVED_FILE} [file normalize f2] { |
| 296 | }] -changes { |
| 297 | RENAMED f2 -> f2n |
| 298 | } -addremove { |
| 299 | } -exists {f1 f2n} -notexists {f2} |
| 300 | |
| 301 | stash-test 3-2 {save -m f2n} { |
| 302 | REVERT f2 |
| @@ -307,11 +307,11 @@ | |
| 307 | test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]} |
| 308 | stash-test 3-2-pop {pop} { |
| 309 | UPDATE f1 |
| 310 | UPDATE f2n |
| 311 | } -changes { |
| 312 | RENAMED f2 -> f2n |
| 313 | } -addremove { |
| 314 | } -exists {f1 f2n} -notexists {f2} |
| 315 | |
| 316 | |
| 317 | |
| @@ -368,11 +368,11 @@ | |
| 368 | stash-test 4-3 {snapshot -m "snap 3"} { |
| 369 | } -changes { |
| 370 | ADDED f0 |
| 371 | DELETED f1 |
| 372 | EDITED f2 |
| 373 | RENAMED f3 -> f3n |
| 374 | } -addremove { |
| 375 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 376 | fossil stash diff |
| 377 | test stash-4-3-diff-CODE {!$::CODE} knownBug |
| 378 | fossil stash show |
| 379 |