Fossil

File History
Login

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

History of test/merge2.test

2016-09-28
23:47
In the random merge test (merge2.test) ignore cases where the parallel random edits overlap, resulting in a merge conflict. file: [03809121] check-in: [caea288c] user: drh branch: trunk, size: 1530
2016-03-02
20:43
Rename the test suite procedure 'repo_init' to 'test_setup'. file: [4fcf75ee] check-in: [413921cc] user: mistachkin branch: testerCleanup, size: 1457
08:13
All test files must now call 'repo_init', using an empty string if they do not require a new repository. file: [f50828fb] check-in: [3a578e04] user: mistachkin branch: testerCleanup, size: 1456
06:45
More work... file: [3c352d39] check-in: [29f0328c] user: mistachkin branch: testerCleanup, size: 1442
2014-01-20
13:08
Allow fossil to be used together with SQLite 3.8.2 amalgamation. Add UTF16-be file for test-purposes. Disable (3-way) merge2 tests which use UTF16 files: 3-way merges with UTF16 files is not (yet) implemented. file: [1915d0a7] check-in: [7e9633a9] user: jan.nijtmans branch: trunk, size: 1347
2014-01-18
13:49
Skip merge-utf-*.23 and merge-utf-*.32 test-cases, which currently fail. They are not crucial for the 1.28 release (in Fossil 1.26 and 1.27 they failed as well). Probably a problem in the test-case itself (some special character in test/utf.test?) file: [cd540372] check-in: [4b3b89b5] user: jan.nijtmans branch: branch-1.28, size: 1332
2013-07-24
12:27
Fix some test-cases, due to name-change "test-3-way-merge" -> "3-way-merge" file: [24c02489] check-in: [8b47f2d2] user: jan.nijtmans branch: trunk, size: 1301
2011-02-08
12:52
Exclude directories from file tests in the test suite. Fix an error in the release checklist. file: [60194e41] check-in: [6502627a] user: drh branch: trunk, size: 1311
2010-12-11
16:36
Add the --tag option to the "commit" command. Add new test cases that make use of the --tag option. Improvements to the testing infrastructure. file: [68ff7665] check-in: [9d723c57] user: drh branch: trunk, size: 1279
2007-07-21
14:10
Initial check-in of m1 sources. file: [9b6f797f] check-in: [dbda8d6c] user: drh branch: trunk, size: 1547 Added