Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/merge3.c at check-in d6fa91fdc843d732
|
2025-12-23
| ||
| 16:06 | Assorted fixes of typos and grammar in code comments. No functional changes. file: [d16fe90bc0] check-in: [e2bdc10572] user: danield branch: trunk, size: 38499 | |
|
2024-12-10
| ||
| 06:25 | Merge trunk into merge-info-html branch for mergestat improvements. file: [3d59981ca7] check-in: [f0a48c8faa] user: stephan branch: merge-info-html, size: 42970 | |
|
2024-12-09
| ||
| 22:51 | Fix a bug in text-merge for the case when the same change occurs along both branches. file: [49ebde3d3e] check-in: [58c74fc5c7] user: drh branch: trunk, size: 38498 | |
| 08:17 | Move filename info into the corresponding merge-info table. Start adding infrastructure for emitting HTML-mode output to the content columns. file: [b3cf7d51cb] check-in: [e3a3f0a5f2] user: stephan branch: merge-info-html, size: 42970 | |
| 07:08 | Get stub table layout in place for merge-info --html. It's not yet clear whether this will suffice. file: [ac93d3c0e7] check-in: [5a1da556d6] user: stephan branch: merge-info-html, size: 42410 | |
|
2024-12-07
| ||
| 20:14 | Plug the debug merge builder into the html builder's as-yet-unimplemented methods to assist in thinking through the next steps. file: [613b641ccb] check-in: [d18f24e2ac] user: stephan branch: merge-info-html, size: 41155 | |
| 19:52 | Set up the main file list loop for merge_info_html(). file: [f0c5d156a5] check-in: [8145725503] user: stephan branch: merge-info-html, size: 40970 | |
| 18:21 | Use a temp table to consolidate how merge-info --html collects its list of files to process. file: [9050a8c895] check-in: [04a868ac21] user: stephan branch: merge-info-html, size: 40378 | |
| 05:19 | Add skeleton for the MergeBuilderHtml, but it doesn't do anything right now except for fail to outright crash. Add an empty TITLE tag to the diff web page output so that a title can be more easily set via JS. file: [b98bb55687] check-in: [e76aceba7c] user: stephan branch: merge-info-html, size: 40376 | |
|
2024-12-05
| ||
| 23:15 | Fix memory leaks in merge. file: [3cf2981b3c] check-in: [337617ba19] user: drh branch: trunk, size: 38498 | |
| 19:22 | Improvements to the merge UI. Fix a mostly-harmless assertion associated with merge marks. file: [efe026862a] check-in: [48827897cf] user: drh branch: better-merge, size: 38418 | |
| 17:13 | In the merge engine, make sure V1 is always used for the local copy and V2 is used for the merge-in. file: [71e9bedbc7] check-in: [873b364b92] user: drh branch: better-merge, size: 38372 | |
| 17:00 | Add a new "SUGGESTED CONFLICT RESOLUTION" section to the conflict markings. file: [c3f4498a20] check-in: [adf2269602] user: drh branch: better-merge, size: 38291 | |
| 13:24 | Reduced memory requirements in merge_try_to_resolve_conflict(). file: [de246f058b] check-in: [1651561630] user: drh branch: better-merge, size: 37770 | |
| 13:16 | Bug fixes sufficient to get the automated merge conflict resolution working. file: [20422a1423] check-in: [1174e5f2fd] user: drh branch: better-merge, size: 37811 | |
| 12:15 | Steps toward doing a better job of automatically resolving merge conflicts. Compiles but does not work. This is an incremental check-in. file: [81b568f18c] check-in: [849c7eb6ca] user: drh branch: better-merge, size: 37368 | |
|
2024-12-04
| ||
| 18:57 | Bug fix in the previous check-in for the "--tk" option on the "3-way-merge" command. file: [cc1b2af132] check-in: [d6fa91fdc8] user: drh branch: trunk, size: 34179 | |
|
2024-12-03
| ||
| 19:20 | The "fossil merge-info --tcl FILE" command generates content for the merge.tcl GUI using MERGESTAT data. Incremental check-in. file: [e2b8e0bdff] check-in: [cbd24a2594] user: drh branch: merge-enhancements, size: 34139 | |
| 13:36 | Add filename labels at the top of each column in the merge display. file: [abcd8bd93d] check-in: [7b8be85206] user: drh branch: merge-enhancements, size: 34158 | |
| 01:31 | Add the "-c N" option to "fossil 3-way --tk". file: [91f940a53e] check-in: [c4b68636e2] user: drh branch: merge-enhancements, size: 33030 | |
| 01:06 | Improvements to the new merge display. file: [266ee8c2d6] check-in: [7002d98d73] user: drh branch: merge-enhancements, size: 32823 | |
|
2024-12-02
| ||
| 21:36 | Continuing work on the --tk option to the 3-way-merge command. file: [107a9f76cb] check-in: [57ae422a37] user: drh branch: merge-enhancements, size: 32152 | |
|
2024-11-28
| ||
| 21:54 | Preliminary implementation of a --tk option to the 3-way-merge command. Lots of work left to do to get this working well. file: [38a2bd7d55] check-in: [bdcacd55be] user: drh branch: merge-enhancements, size: 31610 | |
| 19:13 | Add a --tcl option to the 3-way-merge command. file: [151eba37a6] check-in: [97ab5604ea] user: drh branch: merge-enhancements, size: 28883 | |
| 15:07 | Refactor the 3-way-merge logic to make it easier to extend and enhance. file: [fca1f6cfc5] check-in: [c4df699fd1] user: drh branch: merge-enhancements, size: 24046 | |
|
2024-02-02
| ||
| 22:18 | Remove trailing whitespace from non-external C files. file: [19b67bb5c7] check-in: [7db0a2d910] user: danield branch: fix-overlength-lines, size: 19580 | |
|
2023-02-17
| ||
| 14:37 | A large collection of compiler warning fixes re. signed/unsigned comparison from Daniel D. file: [891dc7498c] check-in: [c71f711ec9] user: stephan branch: compiler-warnings, size: 19582 | |
|
2021-11-06
| ||
| 15:19 | Add some line-number information to the conflict marks on a 3-way merge. More work could be done here, but this is a start. file: [73083af574] check-in: [14f44e933c] user: drh branch: trunk, size: 19577 | |
|
2021-09-06
| ||
| 20:51 | Begin adding value that used to be function arguments into the DiffConfig object. This check-in deals with the pRe parameter. file: [3d10459a13] check-in: [bdb4bfaa3a] user: drh branch: diff-config, size: 19201 | |
|
2021-03-10
| ||
| 12:34 | Ensure that there is always a newline before a conflict mark in merge output. See the [forum:/forumpost/2e97ca6caa|forum discussion]. file: [748bc1e38f] check-in: [b491c196c2] user: drh branch: trunk, size: 19150 | |
|
2020-10-18
| ||
| 18:38 | Fix harmless compiler warnings. Update the custom MinGW makefile. Make feature reporting consistent for 'markdown', which is now always enabled. file: [5a99a8534e] check-in: [750879ead4] user: mistachkin branch: trunk, size: 19112 | |
|
2020-08-25
| ||
| 00:01 | Improvements to handling of line endings and BOM marks when doing a 3-way merge. file: [6d1a4bca4e] check-in: [88ff2642d3] user: drh branch: trunk, size: 19112 | |
|
2020-08-24
| ||
| 22:57 | If both files being merged by 'fossil merge' contain a UTF-8 byte order mark (BOM), keep it in the produced merged file. file: [ce84f97f42] check-in: [91182cd1f3] user: marciogabe branch: merge-crlf-bom, size: 19105 | |
| 22:45 | Adjust 'fossil merge' command to use CR/LF line endings for conflict markings if both files being merged already use such line ending type. file: [3622d775bc] check-in: [60ecf5d9ed] user: marciogabe branch: merge-crlf-bom, size: 18732 | |
|
2020-05-09
| ||
| 17:16 | Change merge conflict marker for common ancestor to follow [https://www.gnu.org/software/diffutils/manual/html_node/Marking-Conflicts.html#Marking-Conflicts|diff3 convention]; see also: [https://fossil-scm.org/forum/forumpost/f54f22dd99 | forumpost/f54f22dd99] file: [f9759d7219] check-in: [d7bc466ac6] user: ashepilko branch: trunk, size: 17254 | |
|
2020-02-25
| ||
| 20:57 | Implemented merge/update --keep-merge-files, per discussion at [https://fossil-scm.org/forum/forumpost/1407a2d73e|/forumpost/1407a2d73e]. file: [d489248852] check-in: [1bfd760de4] user: stephan branch: merge-remove-temp-files, size: 17254 | |
|
2019-09-27
| ||
| 23:56 | Added -- support to (3-way-merge, open, sqlar, stash save|snapshot, tarball, touch, undo/redo, update, zip). file: [20ae250737] check-in: [52ae3288ab] user: stephan branch: double-dash-flag, size: 17072 | |
|
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: [3ed67f9d2a] check-in: [e7767de263] 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: [04153e0e1a] check-in: [9e17c686f5] 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: [be0896e3e4] check-in: [e5b62edb28] user: andygoth branch: trunk, size: 16729 | |
|
2016-10-20
| ||
| 16:48 | Remove extra newlines from calls to fossil_fatal() file: [f72871c5bf] check-in: [2c42b217e5] 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: [555743dac3] check-in: [2a4e31bd8d] user: rberteig branch: ross-spellcheck, size: 16761 | |
|
2015-04-10
| ||
| 05:31 | Minor correction to comment, no code change. file: [b2502f631c] check-in: [d397f1cdc4] 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: [fe6f3002aa] check-in: [0a7e326fa4] 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: [d07e371cc8] check-in: [4e18dba698] 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: [2c986dc9e6] check-in: [a426154b3e] 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: [74f9e253b9] check-in: [45f35169f2] 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: [3107d0e4b2] check-in: [e5c634b1ea] 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: [33796c5a85] check-in: [97a7b924c0] user: drh branch: trunk, size: 15883 | |
|
2012-11-06
| ||
| 12:20 | gcc warnings: <pre>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 </pre> file: [475e466404] check-in: [233463c4ec] 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: [72b9d55020] check-in: [cd2c0e4cb5] user: drh branch: trunk, size: 15908 | |
|
2012-11-04
| ||
| 12:59 | Fix typos. file: [3e25ee1f6a] check-in: [45065c5c28] 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: [aedae8473b] check-in: [1fb2ca625b] 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: [61acc9c0f2] check-in: [9f6abc5968] user: jan.nijtmans branch: msvc-broken, size: 14660 | |
|
2012-03-29
| ||
| 14:54 | Add vim modline everywhere file: [073d2c2ae8] check-in: [a496d8e88d] user: mgagnon branch: mgagnon_fix, size: 14703 | |
|
2012-03-18
| ||
| 23:44 | Fix compiler warnings and update custom makefile. file: [deba3fa65f] check-in: [43631b087b] 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: [08611f2f64] check-in: [471044f664] user: drh branch: trunk, size: 14722 | |
|
2011-11-05
| ||
| 00:23 | Police various compiler warnings. file: [d3273f6f9e] check-in: [536fb1d6e0] 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: [81d2f27fd3] check-in: [3bbbbdfd7d] 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: [e17682def9] check-in: [8a0c546990] 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: [68dfedf02c] check-in: [eea6449098] 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: [5e29f55e24] check-in: [e805fa8db9] 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: [a133c25487] check-in: [792a3bc94a] 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: [185ae0b338] check-in: [e2122bd620] user: drh branch: trunk, size: 14495 | |
| 19:04 | Treat whitespace at the end of lines as significant during a merge. file: [938bc9a668] check-in: [1d93222627] 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: [e28869ae81] check-in: [60c2feea08] 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: [70f80fdc8f] check-in: [60f0986332] 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: [204d064ab3] check-in: [9b7a6f80b2] user: drh branch: trunk, size: 14321 | |
| 14:21 | Infrastructure changes toward adding graphical merging options. file: [6a2b5a6848] check-in: [b9abb86798] user: drh branch: trunk, size: 12023 | |
|
2010-12-16
| ||
| 15:03 | Tweaks to the merge conflict notation. file: [63b5f85ca7] check-in: [bf919337bb] 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: [a494baf01b] check-in: [76ae862ec9] 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: [4b9931cef6] check-in: [a04a650870] user: drh branch: trunk, size: 10831 | |
|
2010-10-14
| ||
| 19:48 | Reverse the direction of conflict markers. Ticket [e3a1beef67c97eb2e4d5a] file: [4fbafbc842] check-in: [93984e2d86] 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: [f6d090e282] check-in: [5ef7435ac0] 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: [3ff5f22230] check-in: [932825bc6a] user: drh branch: trunk, size: 10891 | |
|
2010-05-16
| ||
| 19:08 | Change from GPL to the Simplified BSD License. file: [69776bc58a] check-in: [c06edd231f] 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: [bbe357cf65] check-in: [8e147fdbac] 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: [61efa8a333] check-in: [3e89b0c526] user: drh branch: trunk, size: 11131 | |
|
2009-03-21
| ||
| 19:18 | More improvements to the 3-way merge. Additional test cases added. file: [137ba3bf55] check-in: [81122988ba] user: drh branch: trunk, size: 9060 | |
| 14:12 | More improvements to the 3-way merge algorithm. file: [bd94cf9eaa] check-in: [83566f2424] 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: [04d5b28b92] check-in: [434830cc00] user: drh branch: trunk, size: 8365 | |
| 01:23 | Improve merge conflict markings. file: [b978e84c95] check-in: [e45d478f0c] user: drh branch: trunk, size: 8365 | |
|
2007-11-29
| ||
| 00:37 | Fix the merge conflict detection. file: [e01dd37d11] check-in: [ba9af9aced] 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: [b966dfba2b] check-in: [36b96b8616] 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: [2a2187581a] check-in: [57b2735ebd] 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: [73c60b9f66] check-in: [ac6bb3ce06] user: drh branch: trunk, size: 21048 | |
|
2007-07-21
| ||
| 14:10 | Added: Initial check-in of m1 sources. file: [5d18e08162] check-in: [dbda8d6ce9] user: drh branch: trunk, size: 19770 | |