Fossil SCM
Adjust the 'merge5' test as well.
Commit
b460373e015a2b0c6d6bbfdfac83c6d7f62bccc8
Parent
3a578e049598d1d…
1 file changed
+1
-1
+1
-1
| --- test/merge5.test | ||
| +++ test/merge5.test | ||
| @@ -36,11 +36,11 @@ | ||
| 36 | 36 | } else { |
| 37 | 37 | test merge5-$testid 1 |
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | -require_no_open_checkout; set_home_to_elsewhere | |
| 41 | +require_no_open_checkout; repo_init "" | |
| 42 | 42 | |
| 43 | 43 | # Construct a test repository |
| 44 | 44 | # |
| 45 | 45 | exec $::fossilexe sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql |
| 46 | 46 | fossil rebuild m5.fossil |
| 47 | 47 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -36,11 +36,11 @@ | |
| 36 | } else { |
| 37 | test merge5-$testid 1 |
| 38 | } |
| 39 | } |
| 40 | |
| 41 | require_no_open_checkout; set_home_to_elsewhere |
| 42 | |
| 43 | # Construct a test repository |
| 44 | # |
| 45 | exec $::fossilexe sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql |
| 46 | fossil rebuild m5.fossil |
| 47 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -36,11 +36,11 @@ | |
| 36 | } else { |
| 37 | test merge5-$testid 1 |
| 38 | } |
| 39 | } |
| 40 | |
| 41 | require_no_open_checkout; repo_init "" |
| 42 | |
| 43 | # Construct a test repository |
| 44 | # |
| 45 | exec $::fossilexe sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql |
| 46 | fossil rebuild m5.fossil |
| 47 |