Fossil

File History
Login

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

History of src/merge3.c

2017-11-30
17:58
Refactor the symlink processing logic so that most of the file access routines take a new parameter indicating the conditions under which symlinks should and should not be followed. This should fix a few bugs related to symlink processing. Lots of testing required before merging to trunk. file: [3ed67f9d] check-in: [e7767de2] user: drh branch: symlink-refactor, size: 16897
2017-05-13
18:00
Enhance the "fossil 3-way-merge" command to output a warning in the event of merge conflicts. file: [04153e0e] check-in: [9e17c686] user: drh branch: trunk, size: 16836
2016-11-04
22:37
Consistently use the count(X) macro in place of sizeof(X)/sizeof(*X) throughout the Fossil core, excluding things that don't use makeheaders. Also use count(X) instead of ArraySize(X) which has the same definition. file: [be0896e3] check-in: [e5b62edb] user: andygoth branch: trunk, size: 16729
2016-10-20
16:48
Remove extra newlines from calls to fossil_fatal() file: [f72871c5] check-in: [2c42b217] user: andygoth branch: trunk, size: 16753
2016-04-01
20:21
Work in progress on spell-check and proof-reading sweep over the help text. file: [555743da] check-in: [2a4e31bd] user: rberteig branch: ross-spellcheck, size: 16761
2015-04-10
05:31
Minor correction to comment, no code change. file: [b2502f63] check-in: [d397f1cd] user: andybradford branch: trunk, size: 16762
2014-10-20
15:01
Add a custom static analysis program that verifies the arguments to printf-style varargs routines used in Fossil. Adjust the source code to be more robust for printf format errors and to fix a few minor problems found by the static checker. file: [fe6f3002] check-in: [0a7e326f] user: drh branch: compile-time-print-checking, size: 16761
2014-08-07
10:02
"char const" -> "const char" and various other coding style improvements. No functional change. file: [d07e371c] check-in: [4e18dba6] user: jan.nijtmans branch: trunk, size: 16749
2014-07-30
15:40
Call verify_all_options() on most of fossil CLI commands.    - Skip all the test-* commands for now (may be unnecessary)    - Skip sha1sum, md5sum and artifact because they can take "-" as argument and verify_all_options() would call fatal. Need to handle those differently...    - Command with subcommands that have their options are remaining: branch, bisect, cache, configuration, json, sql, stash, tag, ticket, user, wiki. (not sure how to handle those yet..) file: [2c986dc9] check-in: [a426154b] user: mgagnon branch: verify-all-options, size: 16754
2014-01-28
08:20
More removals of unnecessary end-of-line spaces. No change in code. file: [74f9e253] check-in: [45f35169] user: jan.nijtmans branch: trunk, size: 16683
2013-07-19
12:49
Promote the "test-3-way-merge" command to a "3-way-merge". Add better help text. file: [3107d0e4] check-in: [e5c634b1] user: drh branch: trunk, size: 16684
2013-01-02
00:58
Enhance the diff logic so that it can suppress differences that do not match a regular expression. This capability is so far only exposed on the test-diff command. file: [33796c5a] check-in: [97a7b924] user: drh branch: trunk, size: 15883
2012-11-06
12:20
gcc warnings: src/merge3.c: In function ‘merge_3way’: src/merge3.c:445:9: warning: ‘zPivot’ may be used uninitialized in this function src/merge3.c:446:9: warning: ‘zOrig’ may be used uninitialized in this function src/merge3.c:447:9: warning: ‘zOther’ may be used uninitialized in this function file: [475e4664] check-in: [233463c4] user: jan.nijtmans branch: trunk, size: 15877
2012-11-05
21:10
Do not run the graphical merging tool nor leave merge-droppings after a dry-run merge. Also improve the merge summary message at the end of a merge. file: [72b9d550] check-in: [cd2c0e4c] user: drh branch: trunk, size: 15908
2012-11-04
12:59
Fix typos. file: [3e25ee1f] check-in: [45065c5c] user: dmitry branch: spelling, size: 15663
2012-10-20
00:29
Report unresolved conflicts on "fossil status". Refuse to commit with unresolved conflicts if the --conflict flag is omitted from "fossil commit". file: [aedae847] check-in: [1fb2ca62] user: drh branch: conflict-tracking, size: 15662
2012-08-29
13:57
Allow UTF-8 characters in sources. translate.exe will translate it to ASCII file: [61acc9c0] check-in: [9f6abc59] user: jan.nijtmans branch: msvc-broken, size: 14660
2012-03-18
23:44
Fix compiler warnings and update custom makefile. file: [deba3fa6] check-in: [43631b08] user: mistachkin branch: trunk, size: 14661
2012-03-01
13:40
Leave the -original, -baseline, and -merge files around when an update or merge conflicts due to binary files. file: [08611f2f] check-in: [471044f6] user: drh branch: trunk, size: 14722
2011-11-05
00:23
Police various compiler warnings. file: [d3273f6f] check-in: [536fb1d6] user: mistachkin branch: jimtcl, size: 14617
2011-10-21
20:24
Begin improvement efforts on the "diff" functions by adding the --context option to the "diff" command. file: [81d2f27f] check-in: [3bbbbdfd] user: drh branch: diff-enhancements, size: 14596
2011-09-08
11:59
Introduce new file_wd_* functions that use stat() or lstat() depending on 'allow-symlinks' setting, and use them when dealing with files inside the working directory. Make file_* functions always use stat() as before merging symlink support.    Fix renaming of symlinks when merging (via new function symlink_copy()).    Rename create_symlink() to symlink_create(). file: [e17682de] check-in: [8a0c5469] user: dmitry branch: symlinks, size: 14602
2011-05-02
13:31
Change calls to unlink() into file_delete(). The file_delete() routine converts filenames to MBCS from UTF if necessary. file: [68dfedf0] check-in: [eea64490] user: drh branch: windows-i18n, size: 14599
2011-04-27
18:21
Attempt to get Fossil working on windows systems that do not use UTF8 in the shell. file: [5e29f55e] check-in: [e805fa8d] user: drh branch: windows-i18n, size: 14579
2011-04-18
23:46
Enhance the merge-conflict notation to show both the two recent versions and also the common ancestor version. file: [a133c254] check-in: [792a3bc9] user: drh branch: trunk, size: 14667
2011-03-01
22:07
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]. file: [185ae0b3] check-in: [e2122bd6] user: drh branch: trunk, size: 14495
19:04
Treat whitespace at the end of lines as significant during a merge. file: [938bc9a6] check-in: [1d932226] user: drh branch: trunk, size: 14469
17:45
Fix the content_deltify() routine to always return an integer value. This fixes an error in the previous check-in (the --compress checkin). Also fix a help comment on the test-3-way-merge command. file: [e28869ae] check-in: [60c2feea] user: drh branch: trunk, size: 14469
2011-02-22
12:18
Fix issues in the graphical merge conflict resolution reported on the mailing list. file: [70f80fdc] check-in: [60f09863] user: drh branch: trunk, size: 14412
2011-02-21
16:33
Add the ability to use a graphical merging tool to resolve merge conflicts. Even without a configured graphical tool, leave files behind (VCS droppings) that contain the baseline, original, and merged files. file: [204d064a] check-in: [9b7a6f80] user: drh branch: trunk, size: 14321
14:21
Infrastructure changes toward adding graphical merging options. file: [6a2b5a68] check-in: [b9abb867] user: drh branch: trunk, size: 12023
2010-12-16
15:03
Tweaks to the merge conflict notation. file: [63b5f85c] check-in: [bf919337] user: drh branch: trunk, size: 10941
2010-12-15
01:36
Change the merge conflict marks to identify which part is original content and which part is the content merged in. file: [a494baf0] check-in: [76ae862e] user: drh branch: trunk, size: 10941
2010-11-12
21:51
Add the fossil_nameofexe() function to use in place of g.argv[0]. file: [4b9931ce] check-in: [a04a6508] user: drh branch: trunk, size: 10831
2010-10-14
19:48
Reverse the direction of conflict markers. Ticket [e3a1beef67c97eb2e4d5a] file: [4fbafbc8] check-in: [93984e2d] user: drh branch: trunk, size: 10897
2010-08-21
04:06
The command-line "diff" does not ignore whitespace at the end of lines and it generates a well-formed patch file that can be fed directly into "patch -p 0". Ticket [a9f7b23c2e376af]. GUI diffs and the merge commands do ignore end-of-line whitespace. file: [f6d090e2] check-in: [5ef7435a] user: drh branch: trunk, size: 10897
2010-07-08
17:53
Take care to close the connection to the database file before existing. This gives the database a chance to clean up (and, for example, delete WAL and shared-memory files). file: [3ff5f222] check-in: [932825bc] user: drh branch: trunk, size: 10891
2010-05-16
19:08
Change from GPL to the Simplified BSD License. file: [69776bc5] check-in: [c06edd23] user: drh branch: clear-title, size: 10856
2009-12-19
03:16
Fix a segfault that occurs on an attempt to merge binary files. Ticket [3f2cb270b2f6]. file: [bbe357cf] check-in: [8e147fdb] user: drh branch: trunk, size: 11132
2009-03-22
12:25
Fix a bug in error recovery logic in the 3-way merge. Added new comments to the 3-way merge code to hopefully make it easier to understand. file: [61efa8a3] check-in: [3e89b0c5] user: drh branch: trunk, size: 11131
2009-03-21
19:18
More improvements to the 3-way merge. Additional test cases added. file: [137ba3bf] check-in: [81122988] user: drh branch: trunk, size: 9060
14:12
More improvements to the 3-way merge algorithm. file: [bd94cf9e] check-in: [83566f24] user: drh branch: trunk, size: 9033
2009-03-20
01:26
Turn off the debugging prints that were left on by mistake in the previous check-in. file: [04d5b28b] check-in: [434830cc] user: drh branch: trunk, size: 8365
01:23
Improve merge conflict markings. file: [b978e84c] check-in: [e45d478f] user: drh branch: trunk, size: 8365
2007-11-29
00:37
Fix the merge conflict detection. file: [e01dd37d] check-in: [ba9af9ac] user: drh branch: trunk, size: 6323
2007-11-16
20:42
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. file: [b966dfba] check-in: [36b96b86] user: drh branch: trunk, size: 6289
2007-11-15
21:49
Enhanced text diff subroutine uses Myers enhancements to Wagners minimum edit distance algorithm. White space at the end of lines is ignored. file: [2a218758] check-in: [57b2735e] user: drh branch: trunk, size: 21048
2007-11-07
22:22
Improvements to the merge algorithm so that it works better for common changes. Still more work needed. file: [73c60b9f] check-in: [ac6bb3ce] user: drh branch: trunk, size: 21048
2007-07-21
14:10
Initial check-in of m1 sources. file: [5d18e081] check-in: [dbda8d6c] user: drh branch: trunk, size: 19770 Added