Fossil

Check-in [052d80df]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Pretend to be drh so merge5 tests run without error.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:052d80dff23fd938a6d20095dfaf092ffd981021
User & Date: joel 2014-02-15 05:27:05
Context
2014-02-15
05:57
Fix compiler warning on MSVC. check-in: 783a2a1b user: mistachkin tags: trunk
05:27
Pretend to be drh so merge5 tests run without error. check-in: 052d80df user: joel tags: trunk
05:23
Cleanup makefile for MSVC and add optional Tcl support to it. check-in: 43215959 user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to test/merge5.test.

50
51
52
53
54
55
56

57
58
59
60
61
62
63
set env(HOME) [pwd]

# Construct a test repository
#
exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql
fossil rebuild m5.fossil
fossil open m5.fossil

fossil update baseline
checkout-test 10 {
  da5c8346496f3421cb58f84b6e59e9531d9d424d  one.txt
  ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4  three.txt
  278a402316510f6ae4a77186796a6bde78c7dbc1  two.txt
}








>







50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
set env(HOME) [pwd]

# Construct a test repository
#
exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql
fossil rebuild m5.fossil
fossil open m5.fossil
fossil user default drh --user drh
fossil update baseline
checkout-test 10 {
  da5c8346496f3421cb58f84b6e59e9531d9d424d  one.txt
  ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4  three.txt
  278a402316510f6ae4a77186796a6bde78c7dbc1  two.txt
}