Fossil

File History
Login

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

History of test/merge5.test

2017-04-19
06:58
some end-of-line spacing file: [00a16dbf] check-in: [7f4b50b2] user: jan.nijtmans branch: trunk, size: 10273
2017-03-16
00:04
Skip entire merge5.test until fossil sqlite3 --no-repository works right. file: [80e033b4] check-in: [6167f69a] user: rberteig branch: trunk, size: 10274
2016-11-07
01:29
Remove some tabs and end-of-line whitespace file: [1ec9dcc6] check-in: [bf9669f5] user: andygoth branch: trunk, size: 10045
2016-03-02
20:43
Rename the test suite procedure 'repo_init' to 'test_setup'. file: [aadadc4b] check-in: [413921cc] user: mistachkin branch: testerCleanup, size: 10049
08:25
Adjust the 'merge5' test as well. file: [841e4fa0] check-in: [b460373e] user: mistachkin branch: testerCleanup, size: 10048
06:45
More work... file: [dbe989b5] check-in: [29f0328c] user: mistachkin branch: testerCleanup, size: 10057
06:22
Work in progress on cleaning up home/repo handling in the test suite. file: [e45dc4b6] check-in: [89f76a21] user: mistachkin branch: testerCleanup, size: 9962
2016-03-01
21:50
Set the FOSSIL_HOME envvar before each test. Use the root test run directory instead of the directories created for each test file so the config DB file on Windows doesn't mess up tests of commands like addremove and extras. file: [85583eb7] check-in: [d4907f17] user: joel branch: testCheckoutReform, size: 10062
2016-01-27
02:14
Marked invocations of fossil that are expected to return a non-zero status with the -expectError flag in the amend, clean, and merge5 test files. This makes tester.tcl -quiet be truely quiet for those files when all tests are passing. Deliberately did not mark the invocation in merge6.test which foreshadows the failure of the merge_multi-4 test, as it is not clear to me whether the bug is in the test case or in fossil. file: [4ca266f4] check-in: [62f59956] user: rberteig branch: rberteig-json-test, size: 10202
2016-01-14
22:33
In the 'merge5' test, use the configured Fossil executable instead of relying on the PATH. file: [085bd671] check-in: [acbee54e] user: mistachkin branch: trunk, size: 10176
2016-01-13
01:31
Add the '--no-repository' option to the 'fossil sqlite3' command and make use of it for the merge5 test. file: [1729f3a9] check-in: [56f74a12] user: mistachkin branch: sqlCmdNoRepo, size: 10170
2015-08-15
18:48
Remove stray debugging output in tests. file: [62da8dd2] check-in: [5fdf670f] user: mistachkin branch: trunk, size: 10147
2014-02-15
05:27
Pretend to be drh so merge5 tests run without error. file: [28cc9adf] check-in: [052d80df] user: joel branch: trunk, size: 10161
2011-10-14
19:53
Same trouble as [bf480a29a6] but for the merge5 test. file: [5447884e] check-in: [12960585] user: viriketo branch: declined, size: 10126
19:46
Fixing the merge5 test, for it to run when out of a checkout. The same kind of fix as [0a7ab3ccb0]. file: [e6293271] check-in: [e46be99f] user: viriketo branch: declined, size: 9986
2010-12-22
01:32
Fix up all of the test scripts so that the test results match the latest fossil output. Ticket [4f43f7ff92ae02ae3] file: [9fdb69ba] check-in: [1092a1df] user: drh branch: trunk, size: 9997
2010-12-14
00:06
Another bug fix associating with merges of branches which contain file name changes. file: [301cc8e6] check-in: [4c95b7b9] user: drh branch: trunk, size: 9823
2010-12-13
23:04
Fix a long-standing mtime race condition that can cause problems if a "merge" takes places within the same second as an "update". file: [8e978413] check-in: [af365579] user: drh branch: trunk, size: 9042
20:17
Get "fossil undo" working on merges that involve name changes. file: [5eeb101e] check-in: [5d42fe9f] user: drh branch: trunk, size: 8175
20:12
Futher enhancements to merge: Correct merging happens even on files whose names have changed since the pivot. file: [ec264add] check-in: [c52927c7] user: drh branch: trunk, size: 7803
00:00
A few more merge test cases added. file: [16247ce9] check-in: [3f490bcb] user: drh branch: trunk, size: 7411
2010-12-11
20:08
When merging in a change where a file was deleted in the change, actually remove the file from the working checkout. Update the test cases to verify this is what happens. file: [26cb043b] check-in: [70744b76] user: drh branch: trunk, size: 6392
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: [a6e12b85] check-in: [9d723c57] user: drh branch: trunk, size: 3947 Added