Fossil SCM
Pretend to be drh so merge5 tests run without error.
Commit
052d80dff23fd938a6d20095dfaf092ffd981021
Parent
4321595901edb46…
1 file changed
+1
+1
| --- test/merge5.test | ||
| +++ test/merge5.test | ||
| @@ -52,10 +52,11 @@ | ||
| 52 | 52 | # Construct a test repository |
| 53 | 53 | # |
| 54 | 54 | exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql |
| 55 | 55 | fossil rebuild m5.fossil |
| 56 | 56 | fossil open m5.fossil |
| 57 | +fossil user default drh --user drh | |
| 57 | 58 | fossil update baseline |
| 58 | 59 | checkout-test 10 { |
| 59 | 60 | da5c8346496f3421cb58f84b6e59e9531d9d424d one.txt |
| 60 | 61 | ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt |
| 61 | 62 | 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt |
| 62 | 63 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -52,10 +52,11 @@ | |
| 52 | # Construct a test repository |
| 53 | # |
| 54 | exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql |
| 55 | fossil rebuild m5.fossil |
| 56 | fossil open m5.fossil |
| 57 | fossil update baseline |
| 58 | checkout-test 10 { |
| 59 | da5c8346496f3421cb58f84b6e59e9531d9d424d one.txt |
| 60 | ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt |
| 61 | 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt |
| 62 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -52,10 +52,11 @@ | |
| 52 | # Construct a test repository |
| 53 | # |
| 54 | exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql |
| 55 | fossil rebuild m5.fossil |
| 56 | fossil open m5.fossil |
| 57 | fossil user default drh --user drh |
| 58 | fossil update baseline |
| 59 | checkout-test 10 { |
| 60 | da5c8346496f3421cb58f84b6e59e9531d9d424d one.txt |
| 61 | ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt |
| 62 | 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt |
| 63 |