Fossil

Check-in [acbee54e]
Login

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

Overview
Comment:In the 'merge5' test, use the configured Fossil executable instead of relying on the PATH.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: acbee54e8ba8a3bd9a8f18baabd8bde4814fc0ac
User & Date: mistachkin 2016-01-14 22:33:27
Context
2016-01-17
22:12
Better runtime settings detection by the 'th1' test file. check-in: d8d2222b user: mistachkin tags: trunk
2016-01-16
23:10
More zlib detection before OpenSSL detection. Closed-Leaf check-in: fd2842c0 user: mistachkin tags: zlibBeforeOpenSsl
21:18
Get vanilla configure and make, via autosetup, working on Win32. check-in: 75a0abac user: mistachkin tags: mingwConfigure
2016-01-14
22:33
In the 'merge5' test, use the configured Fossil executable instead of relying on the PATH. check-in: acbee54e user: mistachkin tags: trunk
20:40
Fix typo that prevented the --no-repository option from working. Correction: It actually worked before and the issue was due to an incorrect assumption by the 'merge5' test, namely that the Fossil executable was present in the PATH. check-in: 0a2eaa5a user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to test/merge5.test.

46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
#
# Fossil will write data on $HOME, running 'fossil open' here.
# We need not to clutter the $HOME of the test caller.
set env(HOME) [pwd]

# Construct a test repository
#
exec fossil sqlite3 --no-repository 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







|







46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
#
# Fossil will write data on $HOME, running 'fossil open' here.
# We need not to clutter the $HOME of the test caller.
set env(HOME) [pwd]

# Construct a test repository
#
exec $::fossilexe sqlite3 --no-repository 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