Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/merge.c at check-in 4e3cd6ce4eca7524
|
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-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 | |