Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/merge.c at check-in 30981b64a4fcf74d
|
2026-03-30
| ||
| 12:21 | Make merge a no-op when merging in the current checkout version, as suggested in [forum:6367db867c|forum post 6367db867c]. file: [27971d57e1] check-in: [e84be9f2d6] user: stephan branch: trunk, size: 55271 | |
|
2025-12-23
| ||
| 16:06 | Assorted fixes of typos and grammar in code comments. No functional changes. file: [48171569e8] check-in: [e2bdc10572] user: danield branch: trunk, size: 55257 | |
|
2025-07-23
| ||
| 15:58 | Minor optimization: replace calls to mprintf("%s", X) with fossil_strdup(X). file: [e582115203] check-in: [4c3e1728e1] user: danield branch: trunk, size: 55260 | |
|
2025-06-15
| ||
| 17:12 | Fix `fossil clean` on symlinks by refactoring file_isfile_or_link() to take eFType as well, so that SymFILE doesn't get dropped but passed along instead. file: [23eba88dea] check-in: [9e06f72b71] user: js branch: fix-clean-symlinks, size: 55270 | |
|
2025-02-20
| ||
| 14:46 | Bring the merge-info-html branch up to date with trunk, step 2 of 2. file: [0e781443f4] check-in: [c2b1c2c9fa] user: stephan branch: merge-info-html, size: 63266 | |
| 14:32 | Bring the merge-info-html branch up to date with trunk, step 1 of 2. file: [b6b0b1891a] check-in: [1140b020de] user: stephan branch: merge-info-html, size: 60957 | |
| 13:24 | Fix issues with column names in diff.tcl file: [1f8aadaa86] check-in: [0aceaa3b27] user: drh branch: merge-info, size: 55260 | |
| 11:13 | Add the --tkdebug command-line option to commands that support --tk. Change the --debug option on merge-info into --tkdebug for consistency. file: [7572b311cc] check-in: [5548a91116] user: drh branch: merge-info, size: 55261 | |
| 02:46 | New mechanism for doing 2-way diffs in merge-info that does not require the new "fdiff" command - though the fdiff command is retained for now as it might be useful separately. Still has issues with column names. file: [982a3c39cc] check-in: [3f3e301956] user: drh branch: merge-info, size: 55313 | |
| 00:06 | Improved top-panel button layout on Window for the "fossil merge-into --tk" app. file: [a4a3d14ed5] check-in: [f27e2b0e61] user: drh branch: merge-info, size: 55092 | |
|
2025-02-19
| ||
| 21:47 | Improve the "fossil merge-info --tk" GUI by adding a new menu to show two-way diffs between selected columns. This enhancement required other diff-related enhancements: (1) add the --label option to all diff commands. (2) Add the new "fossil fdiff" command. file: [b6c02811c1] check-in: [e54a4b5fa9] user: drh branch: merge-info, size: 55080 | |
| 17:10 | Add the --debug option to "fossil merge-info --tk". Document that and the --script option. file: [9783ebbd6e] check-in: [97aee327ef] user: drh branch: trunk, size: 53052 | |
|
2024-12-16
| ||
| 16:22 | Add missing word in the help text for 'merge'. file: [3c207fedff] check-in: [bdc6bb1cfb] user: danield branch: trunk, size: 52659 | |
| 16:15 | Do not sync or fill the undo log when running subcommands due to patch. file: [14dfbc25a2] check-in: [cf8f0e4d35] user: drh branch: patch-pull-fix, size: 52652 | |
|
2024-12-10
| ||
| 06:25 | Merge trunk into merge-info-html branch for mergestat improvements. file: [f3847c1e26] check-in: [f0a48c8faa] user: stephan branch: merge-info-html, size: 60354 | |
|
2024-12-09
| ||
| 17:38 | Record merge-info information for the "fossil update" command. file: [66f75d82ef] check-in: [3a18c95df4] user: drh branch: trunk, size: 52449 | |
| 16:47 | The output from "fossil merge-info" appears in priority order: CONFLICT first, then MERGE, then other minor changes. file: [bb541ce3b6] check-in: [0b5dfa9f6c] user: drh branch: trunk, size: 52448 | |
| 08:17 | Move filename info into the corresponding merge-info table. Start adding infrastructure for emitting HTML-mode output to the content columns. file: [03d45d2e0d] check-in: [e3a3f0a5f2] user: stephan branch: merge-info-html, size: 59989 | |
| 07:08 | Get stub table layout in place for merge-info --html. It's not yet clear whether this will suffice. file: [4b6a2c361f] check-in: [5a1da556d6] user: stephan branch: merge-info-html, size: 59893 | |
|
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: [0d28f15018] check-in: [d18f24e2ac] user: stephan branch: merge-info-html, size: 59962 | |
| 19:52 | Set up the main file list loop for merge_info_html(). file: [f89460b821] check-in: [8145725503] user: stephan branch: merge-info-html, size: 59962 | |
| 18:21 | Use a temp table to consolidate how merge-info --html collects its list of files to process. file: [f12902b305] check-in: [04a868ac21] user: stephan branch: merge-info-html, size: 57041 | |
| 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: [8127c2c609] check-in: [e76aceba7c] user: stephan branch: merge-info-html, size: 56709 | |
| 03:31 | Add scaffolding for iterating over lists of files for merge-info --html. Simply emit a UL list for the time being. file: [edd173e24d] check-in: [8bb036bf9a] user: stephan branch: merge-info-html, size: 56431 | |
| 02:26 | Attempt to get the CSS grid view in place for merge-info --html. It can't be tested until we fill out with content, though. file: [7081dc49e5] check-in: [5eac2b1ba1] user: stephan branch: merge-info-html, size: 54634 | |
|
2024-12-06
| ||
| 23:46 | Initial empty scaffolding for merge-info --html/--browser options. There is still much to do here. file: [7cebcb2f7d] check-in: [ca7eceb92c] user: stephan branch: merge-info-html, size: 52764 | |
| 13:49 | Fix the rebuilder so that it does not try to drop shadow tables, which cannot be dropped in newer versions of SQLite, and thus does not error out for databases that have FTS indexes. file: [e7c35b5699] check-in: [55f1366100] user: drh branch: trunk, size: 52084 | |
| 05:17 | Whitespace removal file: [d4602acf2c] check-in: [bbf6c30747] user: brickviking branch: trunk, size: 52038 | |
| 05:07 | (Grammar) Remove duplicate word in comment. file: [ef0cfd73e4] check-in: [6ebc9e0e23] user: brickviking branch: trunk, size: 52040 | |
| 04:07 | Fix a very minor memory leak in the merge logic. file: [4ac807234a] check-in: [6ff817d3c7] user: drh branch: trunk, size: 52044 | |
| 04:03 | Fix a "%d" that ought to be a "%lld" because the argument is a 64-bit integer. This error causes no problems on 64-bit builds, but fails horribly on 32-bit. file: [73b23ed9bf] check-in: [546cbce277] user: drh branch: trunk, size: 52044 | |
| 02:42 | Typo in the previous commit. file: [e04e52c2e2] check-in: [383f8ef1ee] user: drh branch: pi4-fixes, size: 52207 | |
| 02:38 | Correction to the previous check-in. file: [d5921b588a] check-in: [a24f14900d] user: drh branch: pi4-fixes, size: 52207 | |
| 02:26 | <s>Changes to the "merge" command to work around what appears to be a bug in GCC 10.2.1 on Raspbian 10.2.1-6+rpi1, armv6, 32bit.</s> No. Further analysis shows the exact same malfunction in a 32-bit build on i386 using gcc 5.4.0. So this sequence of changes is now moved to a branch. file: [94b3b7d449] check-in: [14959bc587] user: drh branch: pi4-fixes, size: 52191 | |
|
2024-12-05
| ||
| 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: [ab5ad1eff1] check-in: [873b364b92] user: drh branch: better-merge, size: 52042 | |
|
2024-12-04
| ||
| 18:49 | Improved controls at the top of the --tk merge information GUI. file: [f0f0b393cd] check-in: [f8932be5aa] user: drh branch: trunk, size: 52042 | |
| 13:42 | Fix uninitialized variable in the "fossil merge-info --tk" command. file: [7b6331c518] check-in: [3165e1bfb3] user: drh branch: trunk, size: 52153 | |
| 13:38 | By default, the merge-info command only shows "interesting" change - actual merges, errors, and conflicts. Use the --all option to see everything. file: [aa5ea800b4] check-in: [b764f2d007] user: drh branch: merge-enhancements, size: 52149 | |
|
2024-12-03
| ||
| 20:37 | The "fossil merge-info --tk" command appears to be working. Probably there are still undiscovered bugs. file: [29e36e24a9] check-in: [a199d970a5] user: drh branch: merge-enhancements, size: 51262 | |
| 19:20 | The "fossil merge-info --tcl FILE" command generates content for the merge.tcl GUI using MERGESTAT data. Incremental check-in. file: [5fe7a46b97] check-in: [cbd24a2594] user: drh branch: merge-enhancements, size: 48304 | |
| 18:13 | Record information about merge operations in the localdb.mergestat table. Make that information available using the merge-info command. file: [93850f0581] check-in: [625ff9d574] user: drh branch: merge-enhancements, size: 43458 | |
|
2024-11-07
| ||
| 01:09 | Added clarification note for merge command. file: [0649a27c76] check-in: [a35cfda912] user: brickviking branch: bv-corrections01, size: 38253 | |
|
2024-07-20
| ||
| 11:43 | Consistently use a dash in '--no' options, preserving the no-dash variant for compatibility where it exists. file: [7fda3524d9] check-in: [d03ed299d2] user: danield branch: no-x-dash-options, size: 38248 | |
|
2024-07-19
| ||
| 12:53 | Add the --nosync option to commands "commit", "merge", and "branch create". See [forum:/forumpost/592513119fdae69c|forum thread 592513119fdae69c]. file: [dc6afed7bc] check-in: [e8a21ab43c] user: drh branch: trunk, size: 38166 | |
|
2024-05-09
| ||
| 20:55 | Fix an uninitialized variable in the previous check-in. file: [f6ed95443e] check-in: [6e68958586] user: drh branch: trunk, size: 38054 | |
| 20:52 | Change the name of the "cherry-pick" command to "cherrypick", though retain "cherry-pick" as an alias. Extend the "cherrypick" and "merge" commands so that they will accept multiple check-ins to be merged in all in one go. file: [7d55095e43] check-in: [67fe38c4fe] user: drh branch: trunk, size: 37983 | |
|
2024-02-02
| ||
| 22:18 | Remove trailing whitespace from non-external C files. file: [a3e9edb093] check-in: [7db0a2d910] user: danield branch: fix-overlength-lines, size: 36095 | |
| 16:23 | Replace stray tab characters. file: [429a088ff4] check-in: [9db696ea78] user: danield branch: trunk, size: 36098 | |
|
2024-01-13
| ||
| 18:57 | Typo in variable name. file: [a543f2b30f] check-in: [1cd36fad6d] user: preben branch: hash-if-mtime-is-current, size: 36716 | |
|
2024-01-12
| ||
| 17:35 | When merging, make it possible to undo executable status changes. file: [9c2d526316] check-in: [802e3ae9c2] user: preben branch: undo-exe-after-merge, size: 36122 | |
|
2024-01-11
| ||
| 16:34 | Optionally print mtime and mhash in test-show-vfile output. file: [7e996819ff] check-in: [25f486135d] user: preben branch: hash-if-mtime-is-current, size: 36716 | |
|
2023-10-16
| ||
| 14:37 | Add warning-policy setting functionality. file: [8fe3e3e9ca] check-in: [af73acb2df] user: preben branch: warn-on-merging-private-branch, size: 36627 | |
|
2023-10-02
| ||
| 12:46 | Warn user of before merging private to public, or afterwards with --force. file: [7f87173b8a] check-in: [f3fef43c2e] user: preben branch: warn-on-merging-private-branch, size: 36627 | |
| 11:38 | Prompt user to publish artifacts when merging a private branch into a public branch. file: [9a86937a18] check-in: [c07679128e] user: preben branch: warn-on-merging-private-branch, size: 37977 | |
|
2023-06-06
| ||
| 10:52 | merge command help text cleanups, based on forum feedback. file: [53a5346bc5] check-in: [edd08ef4f8] user: stephan branch: trunk, size: 36098 | |
|
2023-03-16
| ||
| 02:08 | Produce merge conflict mark during merge when file exist in current version and in version to be merged, but not in common ancestor. Related forum discussion including test script: [forum:f035bbc8461da6d2]. file: [e6f3866402] check-in: [04e1674c75] user: mgagnon branch: merge-conflict-when-no-file-on-pivot, size: 36200 | |
|
2023-01-09
| ||
| 13:06 | Further consistency improvements in docs for various commands. file: [1f76996e08] check-in: [2512d2d472] user: km branch: trunk, size: 36533 | |
|
2022-12-21
| ||
| 09:31 | Improved consistency for --help option descriptions. file: [637d2cb905] check-in: [2e56ef4e8d] user: km branch: trunk, size: 36560 | |
| 09:00 | Improved consistency for --help option descriptions: begin with uppercase letter; do not use a period at the end of short-ish sentences. file: [50ffaac77a] check-in: [de684083c6] user: km branch: spelling-fixes, size: 36563 | |
|
2022-12-20
| ||
| 09:46 | Change spelling for check-in and similar file: [bd8e6317bf] check-in: [d9c4321e7a] user: danield branch: check-in-spelling, size: 36566 | |
|
2022-11-13
| ||
| 16:26 | Apply fixes to all web views to pass WCAG 2.1 tests performed by "axe DevTools" browser extension. Most fixes related to screen reader compatibility, like making sure that form elements have labels. Some color changes to improve contrast on Default skin. Made more HTML5 compliant. Minor improvement to select combo boxes for UX. Improved Search form UX. Two minor bug fixes for malformed HTML. Fixed help pages to resolve issues with non-compliant HTML being generated. Mostly documented at https://fossil-scm.org/forum/forumpost/aafb17a981df4166 file: [12089fa583] check-in: [1f231db380] user: ericwikman branch: wcag-2.1, size: 36533 | |
|
2022-09-21
| ||
| 17:14 | Backup any unmamaged files that are about to be overwritten by an update or merge. Potentially avoid the loss of a local file if the overwrite warning goes unnoticed, in which case undo is useless. file: [af040057ce] check-in: [e99e58c568] user: mgagnon branch: trunk, size: 36563 | |
|
2022-04-15
| ||
| 13:51 | Enhanced interpretation of the "autosync" setting. It is now possible to set the setting to "on,open=off" to cause autosync to be on by default but off for the "open" command, as an example. Use the "help autosync" command for further detail. file: [3986c0a174] check-in: [346e45702c] user: drh branch: trunk, size: 36220 | |
| 12:33 | Simplify the autosync_loop() interface by omitting the second parameter, which was always the value of the "autosync-tries" setting. Have the autosync_loop() function look up the autosync-tries setting for itself. file: [a37538d459] check-in: [9445f8a8a2] user: drh branch: trunk, size: 36211 | |
|
2022-01-06
| ||
| 19:00 | Corrected new cherry-pick merge alias to account for users entering a partial command name like 'cher'. Reported Martin G. in /chat. file: [02068d1648] check-in: [7ffc999f05] user: stephan branch: trunk, size: 36266 | |
|
2022-01-05
| ||
| 23:26 | Make the merge command behave as if --cherrypick were passed in if merge is invoked with the name cherry-pick, per [forum:/forumpost/7ca2e5dc4c | forum post 7ca2e5dc4c] and /chat discussion. Fixed an unrelated internal doc typo. file: [0aacf3f3f8] check-in: [0421108812] user: stephan branch: trunk, size: 36245 | |
|
2021-10-16
| ||
| 06:52 | Removed the docs for the merge command's --case-sensitive flag, as it does not seem to be applied anywhere. file: [bda6b2485d] check-in: [e340af58a2] user: stephan branch: trunk, size: 36053 | |
|
2021-05-21
| ||
| 17:58 | Do not allow a merge into a closed leaf unless the --force option is used. file: [198021b283] check-in: [2cc7031dde] user: drh branch: trunk, size: 36260 | |
|
2021-04-24
| ||
| 00:54 | More work on merge with renames. Added a test case for the changes in check-in [cb4f38ee6733dccc]. Fix test 6 in merge_renames.test. file: [9da92da6f2] check-in: [33e518b1e2] user: drh branch: trunk, size: 36133 | |
|
2021-04-20
| ||
| 14:16 | Improved robustness of the merge algorithm when merging long-running branches with many name changes. file: [a598ef1fb1] check-in: [dc850c9b3b] user: drh branch: trunk, size: 35774 | |
|
2021-04-16
| ||
| 18:37 | Improvements to the "fossil merge" algorithm so that it works better in complex cases involving branch merges where a file was created on one branch but not the other and had its name changed somewhere along the line. See [forum:/forumpost/549700437b|forum post 549700437b] for discussion. file: [daa8dc30bd] check-in: [cb4f38ee67] user: drh branch: trunk, size: 35630 | |
|
2021-04-15
| ||
| 15:48 | Add the "fossil test-show-vfile" command, and the (undocumented) --show-vfile option on "fossil merge". Both additions are for debugging use only and are unsupported. file: [b53058c5e8] check-in: [f35eb8e2c9] user: drh branch: trunk, size: 34229 | |
| 15:03 | Further improvements to the --debug option on "fossil merge". file: [28d53a7f83] check-in: [0d4d85b05d] user: drh branch: trunk, size: 32413 | |
| 13:21 | Enhanced debugging output for the "fossil merge" command when using the (deliberately undocumented) --debug option. file: [965470533c] check-in: [32778cc061] user: drh branch: trunk, size: 31194 | |
|
2020-07-20
| ||
| 15:18 | Fixed several "Ok" -> "OK". file: [d0ce79b0a7] check-in: [b92e460fd7] user: wyoung branch: trunk, size: 30562 | |
|
2020-04-15
| ||
| 11:12 | Merge in trunk. file: [7d2b5d5d4e] check-in: [7896afa71a] user: florian branch: private-branches, size: 30562 | |
|
2020-02-25
| ||
| 20:57 | Implemented merge/update --keep-merge-files, per discussion at [https://fossil-scm.org/forum/forumpost/1407a2d73e|/forumpost/1407a2d73e]. file: [e58775ef9f] check-in: [1bfd760de4] user: stephan branch: merge-remove-temp-files, size: 30316 | |
|
2019-10-16
| ||
| 17:44 | Improved documentation for the --cherrypick and --backout options of the "fossil merge" command. file: [6279e042ec] check-in: [29a383e4b6] user: drh branch: trunk, size: 29928 | |
|
2019-09-04
| ||
| 08:46 | Make sure the check-in manifest of a merge child does not include a +close tag referring to the leaf check-in on a private branch, so as not to generate a missing artifact reference on repository clones without that private branch. file: [6839f66c80] check-in: [8268c5dafb] user: florian branch: private-branches, size: 29668 | |
|
2019-08-31
| ||
| 16:42 | Merge in latest from trunk. file: [f60d53f9f0] check-in: [aa37639112] user: andybradford branch: db-begin-txn-updates, size: 29416 | |
|
2019-04-25
| ||
| 14:28 | Make full use of the new file_tempname() in "fossil diff" with both --from and --to options. Improve file_tempname() to allow for a suggested differentiator tag. file: [469e165c99] check-in: [1dd2527f2a] user: drh branch: trunk, size: 29422 | |
|
2019-03-19
| ||
| 14:09 | Replace most calls to db_begin_transaction() with db_begin_write() to avoid having a reader locking during a COMMIT. file: [9ababd25af] check-in: [6cc5354821] user: andybradford branch: db-begin-txn-updates, size: 29413 | |
|
2019-01-27
| ||
| 15:35 | Add the "comment-format" setting to set the default options for printing timeline comments to the console, as discussed here: [https://fossil-scm.org/forum/forumpost/d9954370c7]. file: [2b95bd59e9] check-in: [bc62fa1710] user: florian branch: comment-format-setting, size: 29419 | |
|
2019-01-20
| ||
| 21:29 | Automatically update the VFILE and VMERGE tables when the fingerprinting detects that a repository has been replaced by clone. file: [0bb7590e7e] check-in: [b03652382a] user: drh branch: rid-renumbering, size: 29405 | |
|
2019-01-19
| ||
| 21:31 | Change the schema of the vmerge table so that it remembers the hash of merged artifacts, not the RID. Schema updates are automatic, but once the update occurs, you are committed to using the newer version of Fossil moving forward. file: [bf78aa5fa7] check-in: [8977dfb032] user: drh branch: rid-renumbering, size: 29117 | |
|
2018-05-31
| ||
| 14:32 | Fix over-length source code lines in merge.c. file: [6283c41b39] check-in: [5a88b5f663] user: drh branch: trunk, size: 29133 | |
|
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: [c93323af5c] check-in: [e7767de263] user: drh branch: symlink-refactor, size: 29065 | |
|
2017-02-01
| ||
| 04:40 | Rename and repurpose '--no-symlinks' into '--no-dir-symlinks', to prevent traversing into symlinked directories. Make the '--verily' option to 'clean' imply '--no-dir-symlinks'. file: [29e4ffff43] check-in: [66406ae942] user: mistachkin branch: noSymlinks, size: 29184 | |
| 02:16 | Add the --no-symlinks global command line option. file: [588d8cfce6] check-in: [85277aa3b3] user: mistachkin branch: noSymlinks, size: 29243 | |
|
2016-12-24
| ||
| 00:30 | When a file has been deleted on the current branch and edited on a separate branch, bring in the edited version of the file when merging from the separate branch. file: [0d0cf4b86f] check-in: [0df5249d51] user: drh branch: trunk, size: 29111 | |
|
2016-12-21
| ||
| 17:50 | When calling gdiff (or stash gdiff) command between 2 versions, use the filename to prefix the temporary random filename so once inside the external diff program we know what file is being compared. (pending-review) file: [81e9e2ca58] check-in: [856ca01b13] user: mgagnon branch: gdiff-tmpfilename-prefix, size: 29110 | |
|
2016-11-06
| ||
| 16:38 | Correct incorrect commit in [36e7558a11598] (with incorrectly committed code) file: [9616cc1867] check-in: [ae424dc16a] user: andybradford branch: mistake, size: 29070 | |
|
2016-09-06
| ||
| 19:24 | Possible fix for lockup on merge with rename and (maybe?) custom baseline (exact reasons for lockup not 100% known), resolves issue with my (private) repository. Change received from drh via mailing list. See [http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg23838.html] for details. file: [3da95cdecb] check-in: [0120be34ea] user: andygoth branch: merge-rename-lockup, size: 29070 | |
|
2016-05-30
| ||
| 22:25 | On a merge or update, prompt to continue of autosync fails, just like is done for commit. file: [d30fc9d0be] check-in: [d5575d14de] user: drh branch: autosync-failure-prompt, size: 29074 | |
|
2016-05-27
| ||
| 21:03 | Compiler warning and coding style fixes. file: [701c5c4122] check-in: [d037468910] user: mistachkin branch: trunk, size: 29061 | |
|
2016-05-12
| ||
| 21:11 | Properly update the execute bit if it has changed in the commit being merged, and add info about changed permissions to the merge command's output. file: [13be35f2e9] check-in: [3683508e98] user: joel branch: merge-renames, size: 29061 | |
| 20:18 | Remove unnecessary code. file: [a9e5226a82] check-in: [c8421e923c] user: joel branch: merge-renames, size: 28337 | |
|
2016-05-11
| ||
| 02:29 | Ensure that N is also a first-parent ancestor of P for cases where P is not on the same branch as either V or M. file: [d763e3b993] check-in: [8bf221e534] user: joel branch: merge-renames, size: 28499 | |
|
2016-05-09
| ||
| 23:48 | Call pivot_set_*() before each pivot_find() call. file: [cc30b8d03f] check-in: [ec25471c50] user: joel branch: merge-renames, size: 28384 | |
|
2016-05-06
| ||
| 20:27 | Handle merges with a specified baseline that comes after a commit with renames. file: [5baf1e14ad] check-in: [8da901bb98] user: joel branch: merge-renames, size: 28312 | |
| 19:49 | Improve the merge command's ability to handle various scenarios involving renames. file: [2456f2bf4b] check-in: [423029b153] user: joel branch: merge-renames, size: 27901 | |
|
2016-04-18
| ||
| 21:57 | Minor edits to unify merge command warning messages, plus tests. file: [cb45f39415] check-in: [451f04f6fe] user: joel branch: trunk, size: 25439 | |
|
2015-12-23
| ||
| 11:10 | Improvements to handling of localtime. The 'utc' and 'localtime' query parameters now work on all web pages. Timestamps can be expressed with a timezone modifier and that works correctly. file: [1f10514456] check-in: [ea63a2d1f4] user: drh branch: trunk, size: 25440 | |
|
2015-10-26
| ||
| 18:00 | Automatically pull before running the "fossil merge" command, in case there have been new check-ins to the branch being merged. file: [f139750b07] check-in: [16501a04a7] user: drh branch: trunk, size: 25456 | |
|
2015-07-15
| ||
| 18:47 | For the merge command, skip calls into the 'undo' subsystem when the -n (dry-run) flag is used. file: [055f9869ea] check-in: [91ee04cf27] user: mistachkin branch: trunk, size: 25258 | |
|
2015-06-26
| ||
| 18:48 | Merge trunk. file: [559fd25951] check-in: [f3daf39355] user: andygoth branch: undo-clean, size: 25192 | |
|
2015-06-04
| ||
| 17:32 | Fix very minor typo in comment. file: [cf79004e6a] check-in: [76412c68f1] user: andygoth branch: trunk, size: 25168 | |
|
2015-04-27
| ||
| 23:54 | Only check for forks if content was received. file: [d323fe8c09] check-in: [440ed5da09] user: andybradford branch: trunk, size: 25168 | |
|
2015-04-23
| ||
| 00:35 | Only check leaves for forks on multi-child nodes. This prevents warnings from being extra verbose when a commit is made on any of the forks. file: [5b81c58a73] check-in: [64b221aacf] user: andybradford branch: sync-forkwarn, size: 25141 | |
|
2015-04-22
| ||
| 16:32 | Style consistency change only. file: [7e50b1005a] check-in: [e1f614f3b8] user: andybradford branch: sync-forkwarn, size: 24915 | |
| 16:23 | Style consistency change. file: [be667375af] check-in: [509360e5e4] user: andybradford branch: mistake, size: 24884 | |
| 05:21 | Only check for forks in newly received content after all round-trips of sync have completed. file: [f10360e495] check-in: [b9728c4aa2] user: andybradford branch: sync-forkwarn, size: 24917 | |
|
2015-04-16
| ||
| 23:46 | Allow fossil_find_nearest_fork to be used on repository that is not open. file: [feb40ba818] check-in: [97f976785d] user: andybradford branch: trunk, size: 24244 | |
|
2015-04-13
| ||
| 03:38 | Use better fork detection mechanism and disable checking during push since it may not have a complete sync and issue warning prematurely. file: [4b775a1777] check-in: [d0e2f1bd3e] user: andybradford branch: sync-forkwarn, size: 24229 | |
|
2015-04-10
| ||
| 07:55 | Add a warning to "fossil update" when a fork has occurred. file: [d7ca3f928d] check-in: [32998a20f9] user: jan.nijtmans branch: update-fork-warn, size: 23820 | |
|
2015-01-15
| ||
| 09:28 | Remove spacings at end-of-line. No change in any functionality. file: [4c3894827a] check-in: [080ab8cb0a] user: jan.nijtmans branch: trunk, size: 23580 | |
|
2014-12-08
| ||
| 15:36 | An experiment in trying to improve the file history timelines. A schema change is necessary for this improvement, which the present check-in captures. However, the file history timelines have not yet been improved, and in fact are slightly broken at this point. file: [9e0feda4fa] check-in: [e1e9c3a300] user: drh branch: file-history-enhancement, size: 23594 | |
|
2014-09-15
| ||
| 02:36 | Consolidate all use of the capture_case_sensitive_option() function. file: [c04a12cdcb] check-in: [96dc84077f] user: mistachkin branch: captureCaseSensitiveOption, size: 23594 | |
|
2014-08-04
| ||
| 18:29 | minor verbiage patch from Christopher M. Fuhrman. file: [91c9732417] check-in: [d4aee31257] user: stephan branch: trunk, size: 23629 | |
|
2014-07-23
| ||
| 21:37 | When available, pass the original comment text as well as the (possibly prefixed) comment into comment_print(). Add COMMENT_PRINT_ORIG_BREAK flag to the new comment printing algorithm. Change the width argument for the test-comment-format command into an option. Add --origbreak option to the test-comment-format command. file: [bca84f99ac] check-in: [0d0b80fd1c] user: mistachkin branch: trunk, size: 23628 | |
|
2014-07-20
| ||
| 02:35 | Add -comfmtflags command line option to set the comment printing flags, defaulting to the legacy comment printing algorithm. file: [038263477a] check-in: [18a97b3a8f] user: mistachkin branch: experimental, size: 23584 | |
|
2014-07-10
| ||
| 09:25 | merge trunk file: [9d4a4183af] check-in: [a44b4aa5ac] user: jan.nijtmans branch: undo-clean, size: 23578 | |
|
2014-06-20
| ||
| 03:56 | Initial draft of the ability to break a multi-line comment on word boundaries using the new algorithm. file: [28eec0d23f] check-in: [10b47cc350] user: mistachkin branch: experimental, size: 23600 | |
|
2014-06-16
| ||
| 09:05 | Merge trunk. Make it work on Windows too. Variable width output on more commands. file: [100cf67b16] check-in: [40710b7a05] user: jan.nijtmans branch: autoadjust, size: 23554 | |
|
2014-05-20
| ||
| 05:47 | Avoid misinterpretation of operator. file: [5225b9ddf4] check-in: [bfdc38243f] user: andybradford branch: per-round-trip-commit, size: 23554 | |
|
2014-05-08
| ||
| 05:52 | Abort update or merge operation if there is content missing from files. Add --force-missing option to allow override if desired. file: [a7465055e7] check-in: [f2adddfe60] user: andybradford branch: per-round-trip-commit, size: 23483 | |
|
2014-01-28
| ||
| 13:10 | No longer prohibit multiple "merge --integrate"'s without an intermediate commit. "commit --integrate" already allows it, so there is no way to stop people doing that. Fossil versions earlier than [55cacfcace] cannot handle the manifest file produced by such a commit. file: [8f32bbf06c] check-in: [f9f7082ef4] user: jan.nijtmans branch: trunk, size: 23168 | |
|
2013-12-28
| ||
| 22:41 | Eliminate the need to compile SQLite with -Dlocaltime=fossil_locatime. This makes the timeline-utc setting work when fossil is configured with --disable-internal-sqlite. file: [c069a6857c] check-in: [d7fd72dc30] user: jan.nijtmans branch: timeline-utc, size: 23472 | |
|
2013-08-19
| ||
| 14:28 | Don't use a separate Control artifact for "merge --integrate" any more. file: [1f5bf91c79] check-in: [eb8787a326] user: jan.nijtmans branch: merge-integrate, size: 23460 | |
|
2013-07-22
| ||
| 07:52 | Fix bug. file: [0fa3d3b947] check-in: [c9ee3ff674] user: jan.nijtmans branch: merge-integrate, size: 23157 | |
| 07:09 | Add "fossil status" markers for UPDATED_BY_INTEGRATE and ADDED_BY_INTEGRATE file: [70984d9f73] check-in: [e9ffc05c0b] user: jan.nijtmans branch: merge-integrate, size: 23157 | |
|
2013-07-14
| ||
| 14:56 | Rebase. Use -4 as INTEGRATE tag, not -3 file: [5a3b8a98a1] check-in: [967ef5f7c5] user: jan.nijtmans branch: merge-integrate, size: 23117 | |
|
2013-07-12
| ||
| 14:26 | typo file: [2fb53b754c] check-in: [011a4ad1eb] user: jan.nijtmans branch: merge-integrate, size: 23117 | |
| 07:58 | Minor tweaks in error/warning messages. Well-tested now. file: [622a8fac8c] check-in: [5f4b03ebf0] user: jan.nijtmans branch: merge-integrate, size: 23118 | |
|
2013-07-11
| ||
| 08:47 | Implement "fossil merge --integrate" as suggested by Harald Oehlmann. The only part missing is the actual closing of the branch. file: [f14cebbdd6] check-in: [b984ecaf1d] user: jan.nijtmans branch: merge-integrate, size: 22949 | |
|
2013-06-20
| ||
| 13:56 | Change return type of db_last_insert_rowid() to size_t. file: [c0dbbf0680] check-in: [e1cb483a9b] user: jan.nijtmans branch: size_t-rcvid, size: 22500 | |
|
2013-05-23
| ||
| 22:36 | Fix problems with update and merge when case-sensitive is off and two different checkouts each add files that differ only in case. file: [09e32154cd] check-in: [a5a8d0477a] user: drh branch: trunk, size: 22494 | |
|
2013-05-15
| ||
| 08:13 | Some more -v|--verbose additions. Old options names are deprecated, but still work. file: [3fba91738d] check-in: [e3f7ba556b] user: jan.nijtmans branch: trunk, size: 22468 | |
|
2013-05-03
| ||
| 13:50 | Prompt before cleaning files > 10M. Those file deletions are not undo-able. file: [35d24d8c67] check-in: [8e74f0fe40] user: jan.nijtmans branch: undo-clean, size: 22423 | |
|
2013-05-01
| ||
| 09:42 | Add -v|--verbose as alternative to "-l|--detail" everywhere. And "v=" and "verbose=" as alternative to the "detail=" URL parameter. file: [6bc19c4f52] check-in: [5214a2a8b8] user: jan.nijtmans branch: trunk, size: 22399 | |
|
2013-04-26
| ||
| 08:28 | Rename --detail, --showfiles, --files to -v|--verbose (but keep original as deprecated) file: [ba39572db5] check-in: [34ed0afc8a] user: jan.nijtmans branch: verbose, size: 22380 | |
|
2013-04-21
| ||
| 21:59 | Add -n|--dry-run options to commands which already have --test or --nochange. file: [4cb17a9e04] check-in: [0b866397a8] user: jan.nijtmans branch: trunk, size: 22298 | |
|
2013-04-18
| ||
| 18:53 | Record cherrypicks and backouts in the Q card of the check-in manifest. This is the first step in adding display of cherry-picks, ticket [eaf1c4fdbeeca8eb]. file: [b5be7e5f34] check-in: [91aa222d7f] user: drh branch: trunk, size: 22296 | |
| 08:46 | Use the function filename_collation() everywhere in stead of passing caseSensitive as parameter. file: [70ca325fb5] check-in: [3c781f4f0b] user: jan.nijtmans branch: trunk, size: 22157 | |
|
2013-04-17
| ||
| 09:19 | Cygwin: the default value of the "case-sensitive" setting now depends on the case-sensitive setting of the windows kernel. See: [http://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-casesensitive]. Alphabetize some command documentation. file: [b6fffc86cc] check-in: [9359b41fd5] user: jan.nijtmans branch: trunk, size: 22294 | |
|
2013-02-11
| ||
| 19:30 | Merging from trunk. I still have merge conflicts since my previous merge. file: [d371fbf642] check-in: [bdeb633a6c] user: viriketo branch: annotate_links, size: 22310 | |
|
2013-01-17
| ||
| 11:02 | src/merge.c: In function ‘merge_cmd’: src/merge.c:103:7: warning: ‘mid’ may be used uninitialized in this function file: [8da0ad7610] check-in: [39fa6911fc] user: jan.nijtmans branch: trunk, size: 22294 | |
|
2013-01-14
| ||
| 01:53 | Simplifications to the SQL that determines a fork to merge when the "fossil merge" command has no VERSION argument. file: [6593703e67] check-in: [8a470fd4bc] user: drh branch: trunk, size: 22282 | |
| 00:21 | Enhance the "fossil merge" command so that if the VERSION argument is omitted, Fossil tries to merge any forks of the current branch. file: [24f6fae4ec] check-in: [9ee47de254] user: drh branch: trunk, size: 22466 | |
|
2013-01-03
| ||
| 10:31 | Updating from trunk. I've left some merge conflicts to solve (annotate, diff) file: [faa37480bd] check-in: [b5b8448ece] user: viriketo branch: annotate_links, size: 19851 | |
|
2012-12-18
| ||
| 21:04 | Fix a couple typos in comments. file: [b849c75d27] check-in: [55a28e7f5a] user: mistachkin branch: trunk, size: 19835 | |
|
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: [cab745f8a4] check-in: [cd2c0e4cb5] user: drh branch: trunk, size: 19836 | |
|
2012-10-16
| ||
| 12:19 | Updating from trunk. file: [ab9039c93e] check-in: [3cdf9480dd] user: viriketo branch: annotate_links, size: 19683 | |
|
2012-10-11
| ||
| 19:45 | Cherrypick changes [0c37874941c8972], [9ba8a393fcc569b], and [ae092ec605eed11] in order to backport the --setmtime option of "fossil update" and the --age and -t options of "fossil ls" to version 1.19. file: [363cd59dac] check-in: [773c6c5f2c] user: drh branch: branch-1.19, size: 15874 | |
| 19:22 | Add the --setmtime command-line option to "fossil update". When this option is used, the mtime of all unmodified managed files is set to the time when that file was originally checked in. file: [1f87761ed9] check-in: [ae092ec605] user: drh branch: trunk, size: 19667 | |
|
2012-10-09
| ||
| 13:48 | Updating from trunk. I solved some merge conflicts: 1) the checkin info in the vdiff page, taking that from trunk, and 2) the vdiff menu options, which I tried to get similar to what I had in the branch. file: [44b2dcfefe] check-in: [f4b082d464] user: viriketo branch: annotate_links, size: 19673 | |
|
2012-08-31
| ||
| 20:46 | Revert change [208d67675c]. The policy is to keep the Fossil source code ASCII even if Fossil itself is able to handle non-ASCII source files. Furthermore, the [208d67675c] change broken things. Also backout change [34fcb9634e] since it complicates the C code with unnecessary backslash characters in order to changes single-quotes to double-quotes in the generated HTML and Javascript, which is pointless. file: [4341f5c47d] check-in: [c19f34cb69] user: drh branch: trunk, size: 19657 | |
|
2012-08-30
| ||
| 12:05 | Fix overzealous identification of no-op merges that are not really no-ops. file: [d55c04a5fa] check-in: [efba2bc17b] user: drh branch: trunk, size: 19656 | |
|
2012-08-29
| ||
| 23:33 | Allow no-op merges with the --force flag. file: [a59b62cfcc] check-in: [d787bcd44a] user: drh branch: msvc-broken, size: 19682 | |
| 20:57 | undo [bf079432fb]: It's crucial for the Tcl fossil repository to be able to do a no-op merge-mark. This change would make that impossible. file: [b056796af2] check-in: [41577fd3ef] user: jan.nijtmans branch: broken-msvc-2, size: 19306 | |
| 13:57 | Allow UTF-8 characters in sources. translate.exe will translate it to ASCII file: [11d12155bd] check-in: [9f6abc5968] user: jan.nijtmans branch: msvc-broken, size: 19386 | |
|
2012-08-27
| ||
| 22:56 | Make merges a no-op if the pivot is the same as the version being merged. file: [9178965411] check-in: [bf079432fb] user: drh branch: trunk, size: 19387 | |
|
2012-06-29
| ||
| 15:59 | Update to the latest SQLite4 that requires converting preprocessor macro prefixes from "SQLITE_" to "SQLITE4_". file: [b7677d1c98] check-in: [0328d68181] user: drh branch: sqlite4, size: 19316 | |
|
2012-04-05
| ||
| 14:05 | I make 'merge --baseline' not introduce a new parent in the merge checkin. I think it should behave like --cherrypick. file: [0735646a51] check-in: [ba402f33b2] user: viriketo branch: annotate_links, size: 19323 | |
|
2012-03-29
| ||
| 14:54 | Add vim modline everywhere file: [adf68d4370] check-in: [a496d8e88d] user: mgagnon branch: mgagnon_fix, size: 19349 | |
|
2012-02-10
| ||
| 23:37 | Record --backout and --cherrypick merges in the VMERGE table with IDs -2 and -1, respectively. On a --cherrypick merge, make the default check-in comment be the same as the check-in comment for the cherrypicked change. file: [97116104e7] check-in: [9c28bca430] user: drh branch: trunk, size: 19307 | |
| 23:16 | Do not record a full-merge when the --backout option is used. file: [e070d54a50] check-in: [b6710a0143] user: drh branch: trunk, size: 18933 | |
|
2012-02-03
| ||
| 15:05 | Enhance the --detail option on the "merge" command to show the specific check-in that is being merged in and the baseline of the merge. file: [a3e1842fe2] check-in: [68d84047c0] user: drh branch: trunk, size: 18917 | |
|
2011-10-17
| ||
| 23:12 | Fix typo in warning message. file: [6ad7b5363f] check-in: [c80ee413ab] user: drh branch: trunk, size: 17752 | |
| 16:01 | Fixed an incorrect const qualifier (caught by clang). file: [ad61f89cc2] check-in: [fda7c2c63d] user: stephan branch: trunk, size: 17753 | |
| 01:12 | Add new warnings for when Fossil overwrites an unmanged file on "update" or "merge". Undo has been and continues to be available to recover the overwritten files. file: [ef64fd84d6] check-in: [39f979b08c] user: drh branch: trunk, size: 17759 | |
|
2011-10-14
| ||
| 22:20 | Making 'fossil merge' also report a conflict for extra files overwritten. Like [60c6197c8a], but for the merge operation. Related to ticket [953031915f]. file: [3477294eed] check-in: [bb49278a8a] user: viriketo branch: declined, size: 17476 | |
| 22:16 | Reporting the number of merge conflicts at the end of merge, as with update. I think the information is of value to the user. I think that had to be introduced in [070ce24d838a6], from its comment, but that change made the opposite of commented. file: [35de9e0a68] check-in: [e1a7a1d9e2] user: viriketo branch: declined, size: 17331 | |
|
2011-09-14
| ||
| 00:32 | Begin streamline the online documentation to: * always include a short overview of the options supported by a given command, alphabetically sorted * reference similar/related commands with a final See also: section * Use ?x? for optional arguments * collapse supported options into ?OPTIONS? This is commit #1/n. file: [93c87b235c] check-in: [3fbf8caa87] user: martin.weber branch: msw-docco, size: 17310 | |
|
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: [26b7dd3f83] check-in: [8a0c546990] user: dmitry branch: symlinks, size: 17327 | |
|
2011-09-02
| ||
| 16:19 | Do a better job of merging branches that contain lots of file renames. file: [df1939382d] check-in: [0b93b0f958] user: drh branch: trunk, size: 17206 | |
| 13:54 | Fix a missing \n on the trace output of the previous check-in. Also fix a redundancy in the computation of symbolic links. file: [635635e24e] check-in: [597176786b] user: drh branch: trunk, size: 17200 | |
| 13:51 | Add additional trace output with the --debug option on "fossil merge" and especially on filename change tracking. file: [2fc3ee39b0] check-in: [21acce3c35] user: drh branch: trunk, size: 17489 | |
|
2011-09-01
| ||
| 22:55 | Fix merge when merging UPDATEs a symlink to a regular file and vice versa. file: [6fc41bc30a] check-in: [82a95b4692] user: dmitry branch: symlinks, size: 16873 | |
|
2011-08-22
| ||
| 22:20 | Merge trunk. file: [62772149ca] check-in: [c57830bec2] user: dmitry branch: symlinks, size: 16634 | |
|
2011-08-14
| ||
| 07:21 | Merge trunk into ben-testing, adjusting for versionable settings. file: [2a9388a33e] check-in: [246ac307bb] user: ben branch: ben-testing, size: 15884 | |
|
2011-08-04
| ||
| 17:13 | Add experimental changes to support the case-sensitive setting and the --case-sensitive command-line option for "add", "addremove", and "merge". file: [ae9bc9306a] check-in: [4fee0ce2d6] user: drh branch: filename-case, size: 15864 | |
|
2011-06-02
| ||
| 19:38 | Merge versionable settings and empty-dirs setting from versionable-settings branch file: [865c7f4983] check-in: [30ebed1903] user: ben branch: ben-testing, size: 15479 | |
|
2011-06-01
| ||
| 22:32 | In contexts where only a check-out makes since, only resolve tags or branch names into check-outs, not events or other artifacts. Ticket [5f611295e3c2a8]. file: [bc479ffc71] check-in: [2a013f0228] user: drh branch: trunk, size: 15459 | |
|
2011-05-21
| ||
| 16:18 | Slightly hacky way of putting versioned properties in .fossil-settings dir. Version ignore-glob, binary-glob, crnl-glob and manifest. Glob splitting allows line breaks as well as spaces and commas. file: [e54215deeb] check-in: [56b75c768a] user: ben branch: bens-expr, size: 15455 | |
|
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: [8efd7a5dd8] check-in: [eea6449098] user: drh branch: windows-i18n, size: 15435 | |
|
2011-04-27
| ||
| 18:21 | Attempt to get Fossil working on windows systems that do not use UTF8 in the shell. file: [2c721ebdc4] check-in: [e805fa8db9] user: drh branch: windows-i18n, size: 15425 | |
|
2011-04-13
| ||
| 10:23 | Online help for the first few commands edited - to help with very long explanations, the command is summarised at the end for those who just want to check the precise options file: [ffd8edee2b] check-in: [1f851f8467] user: Arjen Markus branch: arjen-doc-updates, size: 15301 | |
|
2011-03-08
| ||
| 17:32 | Do not offer to undo a null-merge. file: [477f902c70] check-in: [ad39c28195] user: drh branch: trunk, size: 15299 | |
|
2011-02-28
| ||
| 19:30 | Cause a merge with --baseline to record the mergepoint rather than ignore it. file: [f350672f45] check-in: [e1ff6c0e35] user: drh branch: trunk, size: 15279 | |
| 02:54 | Changes to get the "merge" command to process execute permission correctly. Ticket [baf9b6b11e08c1d0]. file: [ab387bf0c3] check-in: [7a4d75fc8c] user: drh branch: exe-permission-fix, size: 15276 | |
|
2011-02-21
| ||
| 14:21 | Infrastructure changes toward adding graphical merging options. file: [eaf87ed780] check-in: [b9abb86798] user: drh branch: trunk, size: 15005 | |
|
2011-02-12
| ||
| 13:38 | This branch contains experimental changes attempting to address complaints that Fossil sometimes overwrites unmanaged files. In this checkin: Use file_delete() instead of unlink() everywhere. Add interfaces file_move() and file_dont_overwrite() but do not use those interfaces yet. file: [db5c22a35f] check-in: [a1814d5015] user: drh branch: file-safety, size: 15090 | |
|
2011-01-28
| ||
| 19:04 | Add symlink support for Unix. New settings flag "allow-symlinks" controls this (off by default). file: [8b0700315b] check-in: [ed2ef7e9a3] user: dmitry branch: symlinks, size: 15847 | |
|
2011-01-20
| ||
| 19:02 | Do not make a permanent notation of a merge using --baseline. The --baseline option is really a multi-checkin variation of --cherrypick. file: [89410104fb] check-in: [94c60f3c7e] user: drh branch: trunk, size: 15080 | |
| 18:54 | Add the --baseline option to the "merge" command to facilitate merging of subsections of a branch. file: [be4fc9c49d] check-in: [f7b4517ca7] user: drh branch: trunk, size: 15004 | |
|
2010-12-18
| ||
| 18:56 | The "stash" functionality is now in place. Need to test more prior to merging into trunk. file: [6131cabe35] check-in: [22aa74dcdf] user: drh branch: experimental, size: 14432 | |
| 14:18 | Simplifications to the implementation of undo/redo. Add the --explain option to undo/redo that shows what would be undone or redone without actually doing anything. file: [e2954e0bf8] check-in: [30981b64a4] user: drh branch: trunk, size: 14542 | |
|
2010-12-15
| ||
| 01:49 | Report the number of conflicts at the end of a merge or update and offer a hint to the user about the "fossil undo" command. file: [01985ecbf8] check-in: [070ce24d83] user: drh branch: trunk, size: 14511 | |
| 01:36 | Change the merge conflict marks to identify which part is original content and which part is the content merged in. file: [ee474b9243] check-in: [76ae862ec9] user: drh branch: trunk, size: 14443 | |
|
2010-12-14
| ||
| 15:44 | Simplifications to the merge and update logic. Fix update so that it correctly carries file edits across name changes. file: [35d77c12e4] check-in: [fd8698c8e0] user: drh branch: trunk, size: 14443 | |
| 00:06 | Another bug fix associating with merges of branches which contain file name changes. file: [def9793f08] check-in: [4c95b7b950] user: drh branch: trunk, size: 14684 | |
|
2010-12-13
| ||
| 23:50 | Fix to the fix to the mtime race condition that was supposed to be fixed by the prior check-in. file: [baf4b9d638] check-in: [fa5302c28d] user: drh branch: trunk, size: 14556 | |
| 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: [9885991dd8] check-in: [af365579e7] user: drh branch: trunk, size: 14557 | |
| 20:12 | Futher enhancements to merge: Correct merging happens even on files whose names have changed since the pivot. file: [c8b9c25b90] check-in: [c52927c76d] user: drh branch: trunk, size: 14464 | |
| 13:21 | Take into account local (uncommitted) changes when doing a merge. file: [219734d9b4] check-in: [7ec43ccb7a] user: drh branch: trunk, size: 10342 | |
|
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: [fda84c2a34] check-in: [70744b76e6] user: drh branch: trunk, size: 10229 | |
|
2010-12-08
| ||
| 21:00 | Add the --sha1sum option to the "status" and "changes" commands to force a detailed (but slow) SHA1 checksum verification that files have not changed. file: [022e558733] check-in: [e154a4386b] user: drh branch: trunk, size: 10628 | |
| 20:44 | Add the --nochange and -n options to the "merge" command. file: [87644798a5] check-in: [000af3234f] user: drh branch: trunk, size: 10625 | |
|
2010-11-08
| ||
| 20:04 | merge from trunk file: [9404314776] check-in: [1e801695d3] user: wolfgang branch: StvPrivateHook2, size: 10238 | |
| 15:33 | Fix a typo in an error message in the merge logic. file: [0112468758] check-in: [370a89c832] user: drh branch: trunk, size: 10251 | |
| 15:13 | Allow merges against an empty branch. Ticket [144180bf7db83724a9]. file: [8c80e05bd3] check-in: [4e3cd6ce4e] user: drh branch: trunk, size: 10250 | |
|
2010-10-08
| ||
| 15:05 | fine tuning the layout of the command line help strings file: [4c7bece609] check-in: [c6d1879069] user: wolfgang branch: wolfgangHelpCmd, size: 10321 | |
|
2010-06-23
| ||
| 13:30 | Prompt the user for permission to overwrite files on "fossil open". Ticket [17389900b2e5bd816] file: [8046331529] check-in: [d778ffea81] user: drh branch: trunk, size: 10334 | |
|
2010-05-16
| ||
| 19:08 | Change from GPL to the Simplified BSD License. file: [324d1004f2] check-in: [c06edd231f] user: drh branch: clear-title, size: 10328 | |
|
2010-03-15
| ||
| 18:09 | Add the --binary option to the "merge" command and a new "binary-glob" setting. These identify files that should be treated as binary files and which should not be subjected to a 3-way merge. file: [b7d15ae3ad] check-in: [d327f12522] user: drh branch: trunk, size: 10604 | |
|
2010-03-06
| ||
| 15:49 | Add the --backout option to the "merge" command. file: [09d6fd3ca0] check-in: [3f0393f555] user: drh branch: trunk, size: 9985 | |
|
2010-01-20
| ||
| 16:23 | Add the --cherrypick option to the "merge" command. file: [a03711bee2] check-in: [3005080796] user: drh branch: ssl, size: 9606 | |
|
2010-01-14
| ||
| 15:34 | If a "merge" or "update" or "revert" fails, then automatically rollback any partial changes to the filesystem. Ticket [a9722a15d2]. file: [c13954354b] check-in: [7c3cb28d0f] user: drh branch: trunk, size: 8977 | |
|
2009-12-18
| ||
| 00:29 | Detect when the check-out contains missing files and filesystem objects that ought to be files but are not. Issue reasonable warnings. file: [1bca64b642] check-in: [76f169fca6] user: drh branch: trunk, size: 8960 | |
|
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: [5979683d08] check-in: [36b96b8616] user: drh branch: trunk, size: 8957 | |
|
2007-11-08
| ||
| 16:14 | Add the --detail flag to the merge command. file: [4db3ee048d] check-in: [50ff86afd0] user: drh branch: trunk, size: 8755 | |
|
2007-09-11
| ||
| 02:25 | Add the "undo" and "redo" commands. Untested at this point so don't try to use them yet. file: [246b01382f] check-in: [a36177bcce] user: drh branch: trunk, size: 8531 | |
|
2007-08-30
| ||
| 20:27 | Fix some annoyances with "merge". This involves a schema change to the _FOSSIL_ file. Older versions will continue to work, but it would make since to "close" and "open" local source tree after updating to this version of fossil, in order to update the schema. file: [de0f1b5a76] check-in: [4c82c7773f] user: drh branch: trunk, size: 8385 | |
|
2007-08-18
| ||
| 11:42 | Added options to the "timeline" CLI command. Additional help comments. file: [6daf84ba0a] check-in: [6607844a01] user: drh branch: trunk, size: 8346 | |
|
2007-07-21
| ||
| 14:10 | Added: Initial check-in of m1 sources. file: [c88ea8508f] check-in: [dbda8d6ce9] user: drh branch: trunk, size: 8314 | |