Fossil

History for test/merge1.test
Login

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

History for test/merge1.test

2016-11-07
01:29
[cfdfe536] part of check-in [bf9669f5] Remove some tabs and end-of-line whitespace (check-in: [bf9669f5] user: andygoth branch: trunk, size: 12212)
2016-03-02
20:43
[0f11a55b] part of check-in [413921cc] Rename the test suite procedure 'repo_init' to 'test_setup'. (check-in: [413921cc] user: mistachkin branch: testerCleanup, size: 12214)
08:13
[ce4e7c16] part of check-in [3a578e04] All test files must now call 'repo_init', using an empty string if they do not require a new repository. (check-in: [3a578e04] user: mistachkin branch: testerCleanup, size: 12213)
06:45
[9bb10520] part of check-in [29f0328c] More work... (check-in: [29f0328c] user: mistachkin branch: testerCleanup, size: 12199)
2013-07-24
12:27
[47348543] part of check-in [8b47f2d2] Fix some test-cases, due to name-change "test-3-way-merge" -> "3-way-merge" (check-in: [8b47f2d2] user: jan.nijtmans branch: trunk, size: 12104)
2011-04-18
23:46
[2b9aaabf] part of check-in [792a3bc9] Enhance the merge-conflict notation to show both the two recent versions and also the common ancestor version. (check-in: [792a3bc9] user: drh branch: trunk, size: 12034)
2011-03-01
22:07
[ff51976a] part of check-in [e2122bd6] Fix merge so that it does not segfault when merging text files that do not end in \n and yet have changes at the very end. Ticket [c43d2d9477c2d59a]. (check-in: [e2122bd6] user: drh branch: trunk, size: 11144)
2010-12-22
01:32
[956f7abb] part of check-in [1092a1df] Fix up all of the test scripts so that the test results match the latest fossil output. Ticket [4f43f7ff92ae02ae3] (check-in: [1092a1df] user: drh branch: trunk, size: 11130)
2010-12-11
16:36
[1616acb2] part of check-in [9d723c57] Add the --tag option to the "commit" command. Add new test cases that make use of the --tag option. Improvements to the testing infrastructure. (check-in: [9d723c57] user: drh branch: trunk, size: 10541)
2010-10-30
19:05
[16644e6b] part of check-in [f89d953a] applied patch from ticket [aa01499923] and added option -prot to test tcl script which optionally writes a protocol file (check-in: [f89d953a] user: wolfgang branch: trunk, size: 10809)
2009-03-21
19:18
[310813fc] part of check-in [81122988] More improvements to the 3-way merge. Additional test cases added. (check-in: [81122988] user: drh branch: trunk, size: 10809)
2007-11-16
20:42
[eed9903d] part of check-in [36b96b86] Rework the merge algorithm. It now only works for text files. But, it no longer gets confused by line endings (\r\n versus \n) and it reports conflicts. (check-in: [36b96b86] user: drh branch: trunk, size: 9193)
2007-07-21
14:10
[419c5c1a] part of check-in [dbda8d6c] Initial check-in of m1 sources. (check-in: [dbda8d6c] user: drh branch: trunk, size: 9915) Added