Fossil SCM
Updates to the 'mv-rm' tests.
Commit
7f002bc6b2136c38b7501343599bb057e47e63bfc6314649670568f2717261f9
Parent
9e4ca8948a82ae5…
1 file changed
+2
-2
+2
-2
| --- test/mv-rm.test | ||
| +++ test/mv-rm.test | ||
| @@ -417,21 +417,21 @@ | ||
| 417 | 417 | # Test 18: Move Directory to New Directory # |
| 418 | 418 | ############################################ |
| 419 | 419 | |
| 420 | 420 | fossil mv --hard subdirC subdirD |
| 421 | 421 | test mv-file-new-directory-7 { |
| 422 | - [normalize_result] eq "RENAME subdirC subdirD\nMOVED_FILE ${rootDir}/subdirC" | |
| 422 | + [normalize_result] eq "RENAME subdirC/f10 subdirD/f10\nRENAME subdirC/f11 subdirD/f11\nMOVED_FILE ${rootDir}/subdirC/f10\nMOVED_FILE ${rootDir}/subdirC/f11" | |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | test mv-file-new-directory-8 {[file size subdirD/f10] == 3} |
| 426 | 426 | test mv-file-new-directory-9 {[read_file subdirD/f10] eq "f10"} |
| 427 | 427 | test mv-file-new-directory-10 {[file size subdirD/f11] == 3} |
| 428 | 428 | test mv-file-new-directory-11 {[read_file subdirD/f11] eq "f11"} |
| 429 | 429 | |
| 430 | 430 | fossil revert |
| 431 | 431 | test mv-file-new-directory-12 { |
| 432 | - [normalize_result] eq "REVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}" | |
| 432 | + [normalize_result] eq "DELETE subdirD/f10\nDELETE subdirD/f11\nREVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}" | |
| 433 | 433 | } |
| 434 | 434 | |
| 435 | 435 | test mv-file-new-directory-13 {[file size subdirC/f10] == 3} |
| 436 | 436 | test mv-file-new-directory-14 {[read_file subdirC/f10] eq "f10"} |
| 437 | 437 | test mv-file-new-directory-15 {[file size subdirC/f11] == 3} |
| 438 | 438 |
| --- test/mv-rm.test | |
| +++ test/mv-rm.test | |
| @@ -417,21 +417,21 @@ | |
| 417 | # Test 18: Move Directory to New Directory # |
| 418 | ############################################ |
| 419 | |
| 420 | fossil mv --hard subdirC subdirD |
| 421 | test mv-file-new-directory-7 { |
| 422 | [normalize_result] eq "RENAME subdirC subdirD\nMOVED_FILE ${rootDir}/subdirC" |
| 423 | } |
| 424 | |
| 425 | test mv-file-new-directory-8 {[file size subdirD/f10] == 3} |
| 426 | test mv-file-new-directory-9 {[read_file subdirD/f10] eq "f10"} |
| 427 | test mv-file-new-directory-10 {[file size subdirD/f11] == 3} |
| 428 | test mv-file-new-directory-11 {[read_file subdirD/f11] eq "f11"} |
| 429 | |
| 430 | fossil revert |
| 431 | test mv-file-new-directory-12 { |
| 432 | [normalize_result] eq "REVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}" |
| 433 | } |
| 434 | |
| 435 | test mv-file-new-directory-13 {[file size subdirC/f10] == 3} |
| 436 | test mv-file-new-directory-14 {[read_file subdirC/f10] eq "f10"} |
| 437 | test mv-file-new-directory-15 {[file size subdirC/f11] == 3} |
| 438 |
| --- test/mv-rm.test | |
| +++ test/mv-rm.test | |
| @@ -417,21 +417,21 @@ | |
| 417 | # Test 18: Move Directory to New Directory # |
| 418 | ############################################ |
| 419 | |
| 420 | fossil mv --hard subdirC subdirD |
| 421 | test mv-file-new-directory-7 { |
| 422 | [normalize_result] eq "RENAME subdirC/f10 subdirD/f10\nRENAME subdirC/f11 subdirD/f11\nMOVED_FILE ${rootDir}/subdirC/f10\nMOVED_FILE ${rootDir}/subdirC/f11" |
| 423 | } |
| 424 | |
| 425 | test mv-file-new-directory-8 {[file size subdirD/f10] == 3} |
| 426 | test mv-file-new-directory-9 {[read_file subdirD/f10] eq "f10"} |
| 427 | test mv-file-new-directory-10 {[file size subdirD/f11] == 3} |
| 428 | test mv-file-new-directory-11 {[read_file subdirD/f11] eq "f11"} |
| 429 | |
| 430 | fossil revert |
| 431 | test mv-file-new-directory-12 { |
| 432 | [normalize_result] eq "DELETE subdirD/f10\nDELETE subdirD/f11\nREVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}" |
| 433 | } |
| 434 | |
| 435 | test mv-file-new-directory-13 {[file size subdirC/f10] == 3} |
| 436 | test mv-file-new-directory-14 {[read_file subdirC/f10] eq "f10"} |
| 437 | test mv-file-new-directory-15 {[file size subdirC/f11] == 3} |
| 438 |