Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/update.c at check-in d5575d14dee9244c
|
2024-12-23
| ||
| 18:23 | Fix segfault when dealing with merge conflict involving symlinks (when allow-symlinks is enable) by reducing scope of some Blob local variable. ... (file: [c64fe7b2e1] check-in: [1611c97260] user: mgagnon branch: trunk, size: 37073) | |
|
2024-12-16
| ||
| 16:15 | Do not sync or fill the undo log when running subcommands due to patch. ... (file: [bf365b6653] check-in: [cf8f0e4d35] user: drh branch: patch-pull-fix, size: 37062) | |
|
2024-12-09
| ||
| 22:45 | Gather more transformations for merge-info in a "fossil update". ... (file: [ab2c110079] check-in: [565a49062c] user: drh branch: trunk, size: 36782) | |
| 17:38 | Record merge-info information for the "fossil update" command. ... (file: [5f6199faa1] check-in: [3a18c95df4] user: drh branch: trunk, size: 36217) | |
|
2024-11-26
| ||
| 19:49 | Minor update to conform to style, no change in function. ... (file: [f99ed4cc4c] check-in: [8e06863eeb] user: andybradford branch: show-branch-change, size: 35423) | |
| 19:24 | Only emit the change in branch if there is no VERSION argument to minimize additional output. ... (file: [80e98e9546] check-in: [2ef47b81b4] user: andybradford branch: show-branch-change, size: 35422) | |
|
2024-11-24
| ||
| 03:38 | Improve situational awareness with "fossil update" by including a message in the changes: information if the name of the branch changes. See [forum:7f5ae505e4144a0c | forum discussion 7f5ae505e4144a0c] for details. ... (file: [716662ce67] check-in: [bb9150c403] user: andybradford branch: show-branch-change, size: 35411) | |
|
2024-08-23
| ||
| 13:23 | For 'update --dry-run', remind the user that no file changes have occurred.' ... (file: [dc01914de2] check-in: [06a72cea3a] user: danield branch: trunk, size: 34965) | |
|
2024-07-20
| ||
| 11:43 | Consistently use a dash in '--no' options, preserving the no-dash variant for compatibility where it exists. ... (file: [f32851e633] check-in: [d03ed299d2] user: danield branch: no-x-dash-options, size: 34875) | |
|
2024-02-02
| ||
| 22:18 | Remove trailing whitespace from non-external C files. ... (file: [9364bc0f5b] check-in: [7db0a2d910] user: danield branch: fix-overlength-lines, size: 34789) | |
|
2024-01-12
| ||
| 16:11 | Retain renames in local checkout when running fossil update. ... (file: [9dd0ad1ba1] check-in: [7c284a8c62] user: preben branch: update-with-renames, size: 35347) | |
|
2024-01-11
| ||
| 16:55 | When reverting or updating a file, set the mtime to 0 as already done with merge and stash. Effectively, we don't trust the hash until next time we evaluate the status of the file, at which point we'll update vfile.mtime with the real mtime of the file. Based on discussions in [forum:/forumpost/58bef43842be6fc3|forum thread 58bef43842be6fc3]. ... (file: [6a7858ce79] check-in: [f9686d02de] user: preben branch: hash-if-mtime-is-current, size: 34710) | |
|
2023-06-10
| ||
| 09:03 | Resolve null-pointer deref when reading an empty .fossil-settings/empty-dirs, reported in [forum:9ff6a143fc | forum post 9ff6a143fc]. ... (file: [3518f6180d] check-in: [b1dc25e1fe] user: stephan branch: trunk, size: 34790) | |
|
2023-05-22
| ||
| 22:11 | Switched the empty-dirs setting handler from a one-off parser to glob_create() both so we get consistent behavior across the settings and because glob_create() allows quoted whitespace, needed when asking it to create directories with spaces in them. Addresses [forum:/forumpost/bdbb295ee308c9d6 | this forum report]. ... (file: [a738bfcb2d] check-in: [f12609fcaa] user: wyoung branch: trunk, size: 34778) | |
|
2022-12-20
| ||
| 09:46 | Change spelling for check-in and similar ... (file: [d9c85d3502] check-in: [d9c4321e7a] user: danield branch: check-in-spelling, size: 35013) | |
|
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: [65592545e3] check-in: [e99e58c568] user: mgagnon branch: trunk, size: 34989) | |
|
2022-06-17
| ||
| 09:43 | Merged in trunk. ... (file: [b4520922cc] check-in: [6bdb2fbe99] user: danield branch: version-cmd-describe, size: 34632) | |
|
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: [cb12028388] check-in: [346e45702c] user: drh branch: trunk, size: 34632) | |
| 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: [c051c9c493] check-in: [9445f8a8a2] user: drh branch: trunk, size: 34622) | |
|
2022-03-30
| ||
| 15:08 | Add "--describe" flag to the "version" command to provide context to the most recent major commit tagged with "version*". Run "touch manifest.descr" in the repo root prior to the first build, then build it a second time to get it bootstrapped. ... (file: [e1160aed33] check-in: [4329553d51] user: danield branch: version-cmd-describe, size: 34677) | |
|
2022-02-17
| ||
| 15:04 | 'update' shows the commit date for the updated-from version, for consistency." ... (file: [f195f31da7] check-in: [971dd2364d] user: danield branch: trunk, size: 34677) | |
| 02:38 | 'update' now lists the updated-from version, per off-list user request, the intent being to simplify access to the version for purposes of running a diff after seeing updates arrive. ... (file: [1f8c3feada] check-in: [07ed3fedfa] user: stephan branch: trunk, size: 34540) | |
|
2021-12-27
| ||
| 12:02 | improve warning message for binary merge conflict on update. ... (file: [898006906c] check-in: [d4d739898d] user: mgagnon branch: binary_merge_conflict_fix, size: 34476) | |
| 06:16 | Prevent lost of local change on binary files when having a merge conflict using the update command without the --keep-merge-files flag. ... (file: [6ee6803346] check-in: [d2b02566a7] user: mgagnon branch: binary_merge_conflict_fix, size: 34476) | |
|
2021-07-09
| ||
| 16:15 | Auto-sync prior to running "fossil open". Add the --nosync flags to "fossil open" and "fossil up" to disable the auto-sync. ... (file: [86d89109d9] check-in: [dc97155ec7] user: drh branch: trunk, size: 33978) | |
|
2020-12-18
| ||
| 15:05 | Extend the timeline command to allow customized "pretty" formats. ... (file: [d1daa93931] check-in: [5d3239bf58] user: danield branch: timeline-cmd-formatting, size: 33786) | |
|
2020-11-29
| ||
| 19:30 | Make sure all appropriate SQL function security precautions are in place. ... (file: [164694a88f] check-in: [994a7c72d9] user: drh branch: trunk, size: 33783) | |
|
2020-08-20
| ||
| 13:24 | Version 2.11.2 ... (file: [2ef92e2a1c] check-in: [c58877d6f2] user: drh branch: branch-2.11, size: 32082) | |
| 13:18 | Version 2.10.2 ... (file: [1baa26d7a1] check-in: [12d2ad00de] user: drh branch: branch-2.10, size: 31655) | |
|
2020-08-19
| ||
| 12:26 | Fix harmless compiler warnings. ... (file: [23cbad78c6] check-in: [feef827504] user: drh branch: sec2020, size: 33765) | |
| 12:08 | Improved detection of attempts to write through a symlink. Now also works for "revert", "stash", and "undo/redo". ... (file: [fed418d91f] check-in: [f63297b2c5] user: drh branch: sec2020, size: 33778) | |
|
2020-08-08
| ||
| 23:51 | Many updates to built-in help pages. No changes to code. ... (file: [cb7f7f330b] check-in: [c965636958] user: drh branch: trunk, size: 33687) | |
|
2020-06-25
| ||
| 00:16 | Adjust help text to work better with the new formatter. ... (file: [f2b9d8fe91] check-in: [a8a606996b] user: drh branch: formatted-online-help, size: 33667) | |
|
2020-05-01
| ||
| 20:32 | Update help for the revert command to mention the use with directories. ... (file: [ea0c402106] check-in: [059cd4c6b0] user: ashepilko branch: revert-dir, size: 33543) | |
|
2020-04-30
| ||
| 18:20 | Change names of the added vars to camelcase. ... (file: [62f1b21383] check-in: [7252e631fb] user: ashepilko branch: revert-dir, size: 33350) | |
| 08:25 | Allow a revert of current changes for the whole directory tree ... (file: [e17c2a342f] check-in: [575fe0c8af] user: ashepilko branch: revert-dir, size: 33354) | |
|
2020-04-02
| ||
| 18:56 | Fix the "fossil revert" command so that it works even for a new --empty checkout. ... (file: [65025982df] check-in: [04bbb05df7] user: drh branch: accordion-about-wiki, size: 32004) | |
|
2020-02-25
| ||
| 20:57 | Implemented merge/update --keep-merge-files, per discussion at [https://fossil-scm.org/forum/forumpost/1407a2d73e|/forumpost/1407a2d73e]. ... (file: [fa87da5755] check-in: [1bfd760de4] user: stephan branch: merge-remove-temp-files, size: 31958) | |
|
2019-09-27
| ||
| 23:56 | Added -- support to (3-way-merge, open, sqlar, stash save|snapshot, tarball, touch, undo/redo, update, zip). ... (file: [701cbead1c] check-in: [52ae3288ab] user: stephan branch: double-dash-flag, size: 31889) | |
|
2019-09-19
| ||
| 14:14 | In the db_get(N,D) function, if N is setting, then always leave D as NULL so that we use the published default value for that setting. ... (file: [a5b48c28d9] check-in: [eb804dc674] user: drh branch: trunk, size: 31577) | |
|
2019-08-31
| ||
| 16:42 | Merge in latest from trunk. ... (file: [19ee11b399] check-in: [aa37639112] user: andybradford branch: db-begin-txn-updates, size: 31571) | |
|
2019-06-13
| ||
| 06:15 | Documented the --setmtime flag to the update command. ... (file: [de5656bccb] check-in: [34fcaf829a] user: stephan branch: trunk, size: 31583) | |
|
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: [9d1ee92cb2] check-in: [6cc5354821] user: andybradford branch: db-begin-txn-updates, size: 31390) | |
|
2019-02-26
| ||
| 20:35 | Enhance the "fossil checkout" command to that it too cleans up directories that it makes empty. ... (file: [78f496b5c4] check-in: [95b700c2ab] user: drh branch: rmdir-on-update, size: 31402) | |
| 20:03 | Fix the rmdir-on-update so that it works even if the update is occurring in a subdirectory of the repository. Do not remove the subdirectory that is the current working directory even if it is empty. ... (file: [855d2b5361] check-in: [3275a94436] user: drh branch: rmdir-on-update, size: 31409) | |
| 01:22 | When doing a "fossil update" if files are removed from a directory, then try to delete that directory (if it is empty) at the end of the update, if the directory is not on the empty-dirs list. ... (file: [645be08ac9] check-in: [43111aa939] user: drh branch: rmdir-on-update, size: 31260) | |
|
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: [756208a47a] check-in: [b03652382a] user: drh branch: rid-renumbering, size: 30375) | |
|
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: [0c640d7d75] check-in: [8977dfb032] user: drh branch: rid-renumbering, size: 30344) | |
|
2019-01-10
| ||
| 21:07 | Store "fingerprint" and "checkout-hash" in the VVAR table whenever the working checkout changes. ... (file: [8432046d48] check-in: [e07139a05a] user: drh branch: repo-fingerprint, size: 30388) | |
|
2017-12-07
| ||
| 11:33 | Spelling typos from Debian ... (file: [073b324327] check-in: [4d1ac686c4] user: drh branch: trunk, size: 30396) | |
|
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: [0047cc2a6f] check-in: [e7767de263] user: drh branch: symlink-refactor, size: 30394) | |
|
2017-05-11
| ||
| 10:57 | Move the "revert" command off of the main "fossil help" screen. ... (file: [2d0e0b98cf] check-in: [748ec13b33] user: drh branch: mistake, size: 30428) | |
|
2017-04-23
| ||
| 13:08 | merge trunk. Use new Win10 flag: SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE. See: [https://blogs.windows.com/buildingapps/2016/12/02/symlinks-windows-10/#Y9sMOye6Y8vVYmDx.97] for why this might make this branch work better. ... (file: [c59bd1c63f] check-in: [2999c7dc8a] user: jan.nijtmans branch: winsymlink, size: 30389) | |
|
2017-02-01
| ||
| 04:51 | Missed one. ... (file: [a66c55724d] check-in: [2f19a68768] user: mistachkin branch: noSymlinks, size: 30450) | |
| 04:49 | Reverse accidental whitespace changes. ... (file: [28ed888589] check-in: [e4b78f2003] user: mistachkin branch: noSymlinks, size: 30451) | |
| 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: [fa62875d80] check-in: [66406ae942] user: mistachkin branch: noSymlinks, size: 30471) | |
| 02:16 | Add the --no-symlinks global command line option. ... (file: [6e38513635] check-in: [85277aa3b3] user: mistachkin branch: noSymlinks, size: 30501) | |
|
2016-11-15
| ||
| 23:29 | Fix revert -r option to mark a reverted file as edited if the reverted-to version does not exactly match the checkout version, even if the file size is equal ... (file: [6520d390b5] check-in: [f9080683f0] user: andygoth branch: trunk, size: 30386) | |
|
2016-05-31
| ||
| 08:17 | merge from trunk with a few tweaks for merge conflicts ... (file: [2dbf1a2098] check-in: [598b58a5ee] user: sdr branch: winsymlink, size: 28159) | |
|
2016-05-30
| ||
| 22:25 | On a merge or update, prompt to continue of autosync fails, just like is done for commit. ... (file: [8a39e2408a] check-in: [d5575d14de] user: drh branch: autosync-failure-prompt, size: 28210) | |
|
2016-04-01
| ||
| 04:04 | The revert command no longer resets the undo state if nothing is actually reverted. Additional tests and bug fixes as well. ... (file: [45677835dd] check-in: [418dd7ac51] user: joel branch: revert, size: 30090) | |
|
2015-09-03
| ||
| 23:15 | Merged from trunk with a few tiny edits to make new functionality work on Windows ... (file: [bd162cb1eb] check-in: [8f33e49dd4] user: sdr branch: winsymlink, size: 28146) | |
|
2015-08-03
| ||
| 18:35 | Integrate andygoth-undo-redo-revert-spacing. ... (file: [404e7daea8] check-in: [0a2ebe576d] user: andygoth branch: trunk, size: 28197) | |
|
2015-07-15
| ||
| 20:15 | Further enhancements to the 'undo' subsystem integration. ... (file: [2effb8364b] check-in: [a50be7b87a] user: mistachkin branch: trunk, size: 28198) | |
| 19:38 | For the update command, skip calls into the 'undo' subsystem when the -n (dry-run) flag is used. ... (file: [d840ca6b8f] check-in: [d795eb0b60] user: mistachkin branch: trunk, size: 28173) | |
|
2015-07-14
| ||
| 21:53 | Change formatting of undo/redo/revert command prints for consistency with other commands. Revert used to print "ACTION: filename", now prints "ACTION filename", where number of spaces between ACTION and filename is chosen to maintain column alignment. Likewise undo and redo, except they did not previously use ":". Also change "REVERTED" to "REVERT" to match verb tense used throughout. ... (file: [3617021b83] check-in: [a19c1f4286] user: andygoth branch: andygoth-undo-redo-revert-spacing, size: 27987) | |
|
2015-06-26
| ||
| 18:48 | Merge trunk. ... (file: [1977156e02] check-in: [f3daf39355] user: andygoth branch: undo-clean, size: 28016) | |
|
2015-06-16
| ||
| 13:28 | remove unnecessary end-of-line spacing ... (file: [6acdc89d2d] check-in: [33c44fab3a] user: jan.nijtmans branch: trunk, size: 27988) | |
|
2015-05-26
| ||
| 21:46 | Enhance file_tree_name() to be capable of producing absolute paths within the local tree. Fix --hard option to mv/rm to enable it to work properly with relative paths. ... (file: [d5f0e4b21e] check-in: [c2df31dae8] user: mistachkin branch: mvRmHardFix, size: 27992) | |
|
2015-05-18
| ||
| 14:49 | A few more harmless compiler warnings (discovered using -Wall in latest gcc) ... (file: [e4e6c94829] check-in: [ab5b8d369c] user: jan.nijtmans branch: trunk, size: 27986) | |
| 14:33 | Fix harmless compiler warnings. ... (file: [27bbdc1772] check-in: [b51dcc3162] user: drh branch: trunk, size: 28000) | |
| 13:56 | Fix the empty-dirs property so that creates the complete path of directories, not just leaves, and so that it does not leak memory. ... (file: [2c292c20d7] check-in: [702331e057] user: drh branch: trunk, size: 28012) | |
|
2015-05-17
| ||
| 17:55 | Revert inadvertent style change. ... (file: [b9b8ccc1e2] check-in: [bdb90f6931] user: andygoth branch: andygoth-empty-dirs-parents, size: 28140) | |
| 17:43 | Create parents of empty-dirs if they don't already exist. ... (file: [68147e247f] check-in: [1ab80be485] user: andygoth branch: andygoth-empty-dirs-parents, size: 28137) | |
|
2015-05-02
| ||
| 20:52 | Correct comment describing behavior of errCode. ... (file: [9f0b45a551] check-in: [1b01c1ad26] user: andygoth branch: andygoth-versioned-open, size: 28134) | |
|
2015-04-27
| ||
| 14:39 | Minor spelling correction. ... (file: [38d3a2fba4] check-in: [76cd08baf6] user: andybradford branch: sync-forkwarn, size: 28300) | |
|
2015-04-26
| ||
| 21:28 | An alternative implementation of fork warnings that provides more detail. ... (file: [139cb78d7b] check-in: [4a0deae59d] user: drh branch: alternative-fork-warning, size: 28131) | |
| 17:26 | Another "fork" -> "ambigeous branch" change ... (file: [646d65855d] check-in: [fe7f6f3cc1] user: jan.nijtmans branch: sync-forkwarn, size: 28300) | |
|
2015-04-10
| ||
| 16:35 | Display "fork" status on "fossil info", "fossil status" and related commands as well. ... (file: [ec49dadf96] check-in: [11b7fa6914] user: jan.nijtmans branch: update-fork-warn, size: 28297) | |
| 07:55 | Add a warning to "fossil update" when a fork has occurred. ... (file: [9f50f85206] check-in: [32998a20f9] user: jan.nijtmans branch: update-fork-warn, size: 28288) | |
|
2015-03-18
| ||
| 16:31 | Merged several months worth of trunk into the winsymlink branch. ... (file: [8f6781fc8e] check-in: [f4c1434493] user: sdr branch: winsymlink, size: 28112) | |
|
2015-02-27
| ||
| 13:36 | Remove wordy side bars from two obscure pages. Change "Checkin" to "Check-in" on generated pages. Fix a typo on the webpage-ex.md documentation page. ... (file: [2f07b299aa] check-in: [76e77aba29] user: drh branch: trunk, size: 28163) | |
|
2015-02-10
| ||
| 08:24 | Speedup handling of checked-out files: When multiple information about a file is requested (size, mtime, permission flags) only call stat() once. ... (file: [9c631a3f82] check-in: [dd94e596f4] user: jan.nijtmans branch: trunk, size: 28159) | |
|
2015-01-15
| ||
| 09:28 | Remove spacings at end-of-line. No change in any functionality. ... (file: [c9fbde269b] check-in: [080ab8cb0a] user: jan.nijtmans branch: trunk, size: 28163) | |
|
2014-10-21
| ||
| 15:25 | merge trunk ... (file: [4f9b0996fd] check-in: [44a160a341] user: jan.nijtmans branch: winsymlink, size: 28078) | |
|
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: [2f69d6a503] check-in: [0a7e326fa4] user: drh branch: compile-time-print-checking, size: 28221) | |
|
2014-10-17
| ||
| 15:31 | Enchance the command-line timeline to accept the name of a file or directory as an argument and then only show the entries that have changes to that file or directory. ... (file: [0a59d9c7cb] check-in: [a50c3cfd61] user: drh branch: cmdline-timeline-enhancement, size: 28103) | |
|
2014-09-25
| ||
| 19:21 | Summary: a number of changes to improve windows symlink handling. Detail: fixed file_contains_merge_marker failure on windows symlinks; fixed inadequate S_ISLNK macro for windows; backed out change made to revert query ("OR islink" removed); added special processing to vfile_check_signature for windows symlink type changes; fixed a few flaws in the windows specific posix-compatibility routines to improve symlink handling. ... (file: [ccad46cdae] check-in: [9c5bbd6a01] user: sdr branch: winsymlink, size: 27959) | |
|
2014-09-23
| ||
| 00:56 | Merge updates from trunk. ... (file: [cf0a530aef] check-in: [44ded27f7c] user: mistachkin branch: winsymlink, size: 27969) | |
|
2014-09-20
| ||
| 18:41 | Changed name of checked_symlink_create to create_symlink_or_file as it is more accurate / descriptive. Also changed some parameter names, and fixed a couple spelling errors (accidentally typed blog instead of blob and never compiled; oops). ... (file: [ce7ae4402a] check-in: [31b0a9d737] user: sdr branch: bad-winsymlink, size: 28004) | |
| 18:32 | Refactored symlink_create repeated block of code into a checked_symlink_create function. ... (file: [db6619c6c5] check-in: [2d3ff7bd23] user: sdr branch: bad-winsymlink, size: 28004) | |
| 18:11 | Modified revert to always process symbolic links. Also added link_delete to complement file_delete, as windows needs special delete handling for symbolic links as they might be directory symlinks. ... (file: [682331e19f] check-in: [9e0ba1215d] user: sdr branch: bad-winsymlink, size: 28147) | |
|
2014-09-15
| ||
| 02:36 | Consolidate all use of the capture_case_sensitive_option() function. ... (file: [f4a971b472] check-in: [96dc84077f] user: mistachkin branch: captureCaseSensitiveOption, size: 28102) | |
|
2014-07-31
| ||
| 20:54 | [/help/update|update] doc improvements from the ML. ... (file: [e8dc2b9753] check-in: [8ab520c589] user: stephan branch: trunk, size: 28137) | |
|
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: [acf9039e4e] check-in: [a426154b3e] user: mgagnon branch: verify-all-options, size: 27913) | |
|
2014-07-27
| ||
| 23:48 | Fix [http://permalink.gmane.org/gmane.comp.version-control.fossil-scm.user/17266] ... (file: [e88242df12] check-in: [4a1188d569] user: jan.nijtmans branch: branch-1.29, size: 27299) | |
| 20:52 | Proposed fix for corner-case: [http://permalink.gmane.org/gmane.comp.version-control.fossil-scm.user/17266] ... (file: [57a8410c8d] check-in: [0d8cb8e30a] user: jan.nijtmans branch: no-initial-commit, size: 27846) | |
|
2014-07-10
| ||
| 09:25 | merge trunk ... (file: [0b4a0a0275] check-in: [a44b4aa5ac] user: jan.nijtmans branch: undo-clean, size: 27833) | |
|
2014-06-20
| ||
| 20:54 | Make sure the --width option is honored by all calls into print_timeline(). ... (file: [ac73ea5d01] check-in: [e3df30f45c] user: mistachkin branch: trunk, size: 27805) | |
|
2014-06-13
| ||
| 23:34 | Minor code style and spacing cleanup. ... (file: [83bf95bd25] check-in: [40d5560f22] user: mistachkin branch: trunk, size: 27318) | |
|
2014-05-30
| ||
| 14:54 | Allow multiple autosync attempts also for the branch and update commands. ... (file: [37f6eb87fc] check-in: [87d323d307] user: andybradford branch: autosync-tries, size: 27319) | |
|
2014-05-09
| ||
| 03:03 | Correction in comment, no change in functionality. ... (file: [68599beb9f] check-in: [4cfe13e962] user: andybradford branch: per-round-trip-commit, size: 27258) | |
|
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: [fbf294f384] check-in: [f2adddfe60] user: andybradford branch: per-round-trip-commit, size: 27258) | |
|
2014-05-07
| ||
| 04:00 | Make error message less redundant. ... (file: [514ca0e45d] check-in: [d02f144d70] user: andybradford branch: per-round-trip-commit, size: 26972) | |
|
2014-05-05
| ||
| 07:26 | Abort the update if autosync fails. ... (file: [383354ac69] check-in: [8478bfe27e] user: andybradford branch: per-round-trip-commit, size: 26976) | |
|
2014-04-01
| ||
| 18:43 | Get the "fossil cat" command working outside of a check-out using the -R option. This is an alternative implementation to the fix-cat-dash-R branch that avoids adding a new global variable. ... (file: [f90dabeaf7] check-in: [ebe97b79f2] user: drh branch: trunk, size: 26910) | |
|
2014-02-23
| ||
| 05:15 | Fix reverting the combination of a renamed file and an added file that uses the renamed file's original filename. (This previously failed on a UNIQUE constraint.) ... (file: [c08d957556] check-in: [bd0b09e50b] user: joel branch: trunk, size: 26817) | |
| 02:14 | Refactor revert command SQL slightly. ... (file: [80b376cecb] check-in: [e66a12ec4b] user: joel branch: trunk, size: 26806) | |
|
2014-01-08
| ||
| 17:40 | <strong>Fix some remaining corner cases when having a checkout on '/'..</strong> Update command: * Was asserting when localroot is '/' file_cannonical_name(): * Return '/' instead of '.' when refering to '/'. * Avoid the double '/' on beginning. * Refactoring to avoid some duplicated code. file_relative_name(): * Handle properly relative path when working on '/'. ... (file: [37748a57dc] check-in: [89ad123f5c] user: mgagnon branch: checkout_on_root_fix, size: 26897) | |
|
2013-10-30
| ||
| 09:11 | Make "fossil add", "fossil addremove", "fossil update" and "fossil co --latest" work when the repository doesn't contain any commit yet. This is not a fatal situation at all. ... (file: [8834951295] check-in: [b725c1cf26] user: jan.nijtmans branch: trunk, size: 26897) | |
|
2013-10-29
| ||
| 12:58 | Fix existing print_timeline() calls, so they return the same output as trunk by default. ... (file: [ab8c15d318] check-in: [11634df5ea] user: jan.nijtmans branch: timeline_cmd_dash_n_fix, size: 27014) | |
|
2013-10-26
| ||
| 09:06 | Allow comment_print() to handle lines >400 characters. Add parameter "width" to print_timeline() function. ... (file: [c02970a193] check-in: [b2455507cb] user: jan.nijtmans branch: trunk, size: 27013) | |
|
2013-10-25
| ||
| 12:42 | Merge trunk. Add the "-W|--width WIDTH" option to "fossil timeline". Default is 80. ... (file: [beb359e118] check-in: [3710f2ac5b] user: jan.nijtmans branch: timeline_cmd_dash_n_fix, size: 27014) | |
|
2013-10-17
| ||
| 12:22 | Minor suggested update: - If N=0 there should be no limit. - If N<0 (undocumented) restore the old behavior of counting lines in stead of entries. ... (file: [83d60b462f] check-in: [6c02f699af] user: jan.nijtmans branch: timeline_cmd_dash_n_fix-2, size: 27010) | |
|
2013-10-04
| ||
| 09:30 | Better error-message in case of "manifest file is malformed" ... (file: [6e8db8ffa7] check-in: [1eb438d61a] user: jan.nijtmans branch: pending-review, size: 27009) | |
|
2013-09-09
| ||
| 13:11 | Bug fix to "update": identify the local user correctly. Contributed by Andy Bradford. ... (file: [c6beda2b80] check-in: [8e50e2e7bd] user: drh branch: trunk, size: 27006) | |
|
2013-08-30
| ||
| 03:06 | Change most uses of fossil_panic() to fossil_fatal(). Modify fossil_panic() to avoid allocating heap memory and to close the database connection before doing anything else. ... (file: [04c06e5a32] check-in: [320f14363e] user: drh branch: trunk, size: 26989) | |
|
2013-08-26
| ||
| 18:23 | If a file has been "fossil rm"-ed in the local checkout - which has not been committed, then a "fossil update" is done to another version that has no changes on that file, then silently keep that file unmanaged. ... (file: [aa3e5ca6bc] check-in: [2918effe0d] user: drh branch: trunk, size: 27005) | |
| 18:00 | Fix typos in the "fossil update" logic. ... (file: [ac5229faee] check-in: [5a1d13ee50] user: drh branch: trunk, size: 27057) | |
|
2013-07-17
| ||
| 12:04 | merge trunk ... (file: [5a3461441c] check-in: [5d8551bfa1] user: jan.nijtmans branch: ui-no-utf8, size: 27059) | |
|
2013-05-24
| ||
| 07:01 | "fossil update" operates on the local filesystem, so it should have the --case-sensitive option. ... (file: [cb54091f53] check-in: [13c7c61ada] user: jan.nijtmans branch: trunk, size: 27055) | |
|
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: [2be9f80718] check-in: [a5a8d0477a] user: drh branch: trunk, size: 26959) | |
|
2013-05-20
| ||
| 10:58 | doc fix ... (file: [d8d1c0d2f4] check-in: [122b631c31] user: jan.nijtmans branch: trunk, size: 26886) | |
|
2013-05-03
| ||
| 13:50 | Prompt before cleaning files > 10M. Those file deletions are not undo-able. ... (file: [72c1678b2c] check-in: [8e74f0fe40] user: jan.nijtmans branch: undo-clean, size: 26916) | |
|
2013-04-21
| ||
| 21:59 | Add -n|--dry-run options to commands which already have --test or --nochange. ... (file: [eb67722184] check-in: [0b866397a8] user: jan.nijtmans branch: trunk, size: 26888) | |
|
2013-03-19
| ||
| 10:06 | merge trunk (still experimental) ... (file: [417819cb41] check-in: [af4d780446] user: jan.nijtmans branch: use-blob_strip_bom, size: 26840) | |
|
2013-02-27
| ||
| 11:30 | comment fix ... (file: [780a0d7cf2] check-in: [f78a487f43] user: jan.nijtmans branch: use-blob_strip_bom, size: 26841) | |
| 11:26 | merge trunk ... (file: [2bb8bcfb0f] check-in: [d085eb9aca] user: jan.nijtmans branch: use-blob_strip_bom, size: 26842) | |
|
2013-01-25
| ||
| 23:49 | Fix 'fossil revert' to fully revert renames ... (file: [62efa1b452] check-in: [eef34741a9] user: joel branch: trunk, size: 26837) | |
|
2013-01-07
| ||
| 15:03 | Fix "fossil revert" so that it works on files that have been renamed. ... (file: [2600176f76] check-in: [48798b2719] user: drh branch: trunk, size: 26303) | |
|
2012-11-20
| ||
| 14:28 | Prevent blank user names from being displayed for items awaiting moderation. Also, Show much less output on a sync operation, unless the --verbose flag is given. ... (file: [a226834189] check-in: [15708574fe] user: drh branch: trunk, size: 26148) | |
| 02:05 | Show much less output on a sync operation, unless the --verbose flag is given. ... (file: [3c1d8f7134] check-in: [407cd4c534] user: drh branch: less-verbose-sync, size: 26112) | |
|
2012-11-06
| ||
| 19:47 | Make sure that pending deletes from "fossil rm" operations are preserved across a "fossil update". ... (file: [a155e1e95f] check-in: [76c6f8fcb8] user: drh branch: branch-1.19, size: 22714) | |
| 19:42 | Make sure that pending deletes from "fossil rm" operations are preserved across a "fossil update". ... (file: [5d56ff23f3] check-in: [28272fa125] user: drh branch: trunk, size: 26116) | |
|
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: [818535fc6a] check-in: [cd2c0e4cb5] user: drh branch: trunk, size: 25653) | |
| 13:56 | merge trunk ... (file: [94fa9843eb] check-in: [b0e05a90b6] user: jan.nijtmans branch: use-blob_strip_bom, size: 25583) | |
|
2012-11-04
| ||
| 12:59 | Fix typos. ... (file: [3ec1a8a0ac] check-in: [45065c5c28] user: dmitry branch: spelling, size: 25578) | |
|
2012-10-30
| ||
| 15:18 | working utf-16 diff, still being tested ... (file: [f28a36842d] check-in: [879d1e2405] user: jan.nijtmans branch: use-blob_strip_bom, size: 25584) | |
|
2012-10-24
| ||
| 19:08 | Fix the --setmtime flag on fossil-commit so that it works when changing version, and not just when updating the current version. ... (file: [d90c6bde72] check-in: [d4bdac3c51] user: drh branch: branch-1.19, size: 22238) | |
| 19:04 | Fix the --setmtime flag on fossil-commit so that it works when changing version, and not just when updating the current version. ... (file: [8fe7d39272] check-in: [1d3256cbca] user: drh branch: trunk, size: 25577) | |
|
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: [c5ae742aa5] check-in: [773c6c5f2c] user: drh branch: branch-1.19, size: 22238) | |
| 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: [27cd294b9d] check-in: [ae092ec605] user: drh branch: trunk, size: 25577) | |
|
2012-10-05
| ||
| 20:39 | Add the "stash show" command. Simplifications to the diff code, and especially the looks_like_binary() function. ... (file: [a20da9ef72] check-in: [4e0e69f691] user: drh branch: trunk, size: 25391) | |
|
2012-09-30
| ||
| 06:25 | Add support for skipping binary files when using an external diff program. The existing 'binary-glob' setting and new 'diff-binary' boolean setting control this feature. ... (file: [1470978c16] check-in: [c50eb50718] user: mistachkin branch: diffBinExternal, size: 25421) | |
|
2012-09-06
| ||
| 10:23 | Show the number of changes following a "fossil update". ... (file: [5b74d4f9de] check-in: [3db1cf69e5] user: drh branch: trunk, size: 25216) | |
|
2012-08-29
| ||
| 13:57 | Allow UTF-8 characters in sources. translate.exe will translate it to ASCII ... (file: [5b580dfeb1] check-in: [9f6abc5968] user: jan.nijtmans branch: msvc-broken, size: 24872) | |
|
2012-06-29
| ||
| 15:59 | Update to the latest SQLite4 that requires converting preprocessor macro prefixes from "SQLITE_" to "SQLITE4_". ... (file: [81fa24df8c] check-in: [0328d68181] user: drh branch: sqlite4, size: 24877) | |
|
2012-06-27
| ||
| 12:30 | Begin a branch that is modified to use sqlite4 instead of sqlite3 as the storage engine. This check-in compiles (on unix) but does not work. ... (file: [f925c673a7] check-in: [6823912746] user: drh branch: sqlite4, size: 24873) | |
|
2012-06-11
| ||
| 17:33 | merge trunk again... (previous merge was not from latest trunk from fossil-scm.org) ... (file: [a2bfca115b] check-in: [7a57ab6465] user: mgagnon branch: mgagnon_fix, size: 24915) | |
|
2012-04-06
| ||
| 17:24 | (1) Show cherrypick and backout merges in the status command (2) Allow partial commits of cherrypick and backout merges (3) Prompt user to continue if a check-in comment is unedited (4) Fixing a jump on uninitialized data on web sbs diff - cherrypick of [92b2a5c390467a] (5) Updates against an uncommitted merge are now a warning, not a fatal error. ... (file: [bee8c866be] check-in: [195517a9c9] user: drh branch: trunk, size: 24873) | |
|
2012-03-29
| ||
| 14:54 | Add vim modline everywhere ... (file: [ebfa8b7638] check-in: [a496d8e88d] user: mgagnon branch: mgagnon_fix, size: 24396) | |
|
2012-03-01
| ||
| 13:40 | Leave the -original, -baseline, and -merge files around when an update or merge conflicts due to binary files. ... (file: [bdb27e27a1] check-in: [471044f664] user: drh branch: trunk, size: 24354) | |
|
2012-02-10
| ||
| 18:02 | climb up the trunk. From up here, clarify wording of the "building and installing" wiki page: you don't need to log in to get the source code for released versions of fossil, the download page will have a shiny source package for you to fetch. ... (file: [fc67e0f369] check-in: [587dd57fe1] user: martin.weber branch: msw-docco, size: 24352) | |
|
2012-02-09
| ||
| 13:55 | Experimental changes to the "update" command to have it report when it makes no changes to the repository. ... (file: [8fd7f7d6ec] check-in: [be10939bff] user: drh branch: experimental, size: 24267) | |
|
2012-02-03
| ||
| 17:00 | Fix oversize lines in the update.c source file. ... (file: [bf4a87ca6c] check-in: [b18a178d8e] user: drh branch: trunk, size: 23919) | |
|
2011-12-06
| ||
| 00:09 | The finfo command and the file browsing pages of the web UI now honor the case-sensitive option and merge filenames that differ only in case as requested. ... (file: [e9bc01475a] check-in: [9c90b0f052] user: drh branch: trunk, size: 23775) | |
|
2011-10-17
| ||
| 23:12 | Fix typo in warning message. ... (file: [cd95327645] check-in: [c80ee413ab] user: drh branch: trunk, size: 23775) | |
| 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: [627f46f0ac] check-in: [39f979b08c] user: drh branch: trunk, size: 23776) | |
|
2011-10-14
| ||
| 20:25 | Making fossil warn about a conflict, if an update operation overwrites an extra file. This should close ticket [953031915f]. ... (file: [95511562fe] check-in: [60c6197c8a] user: viriketo branch: declined, size: 23575) | |
|
2011-10-12
| ||
| 17:41 | Adding a more options at naming commits for diff and update commands. I wrote a new function that allows more kind of specifications for a checkin uuid: checkout, parent and pivot:id1:id2. If there was a way to discover the 'parent branch' of the current checkout, there could be a 'parentbranch' naming too. I think this makes the life easier, specially for the pivot:id1:id2 case, about seeing the difference between a branch and its parent branch. I find myself using often the test-find-pivot command just to get that diff or update to the pivot, to check changes between the current branch and the parent branch. ... (file: [228b51f083] check-in: [9fe787ec03] user: viriketo branch: extended_ci_names, size: 23422) | |
|
2011-09-27
| ||
| 19:15 | Change a few instances of file_isdir() to file_wd_isdir(). ... (file: [c01f216708] check-in: [f1329470c0] user: dmitry branch: trunk, size: 23420) | |
|
2011-09-15
| ||
| 00:54 | Further progress towards jerusalem on yet another holy docco crusade! Checkin #3/n ... (file: [54de7010d6] check-in: [17f21f2482] user: martin.weber branch: msw-docco, size: 23847) | |
|
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: [fc6895cfa6] check-in: [8a0c546990] user: dmitry branch: symlinks, size: 23414) | |
|
2011-09-02
| ||
| 16:19 | Do a better job of merging branches that contain lots of file renames. ... (file: [90bd6288b7] check-in: [0b93b0f958] user: drh branch: trunk, size: 23390) | |
| 13:51 | Add additional trace output with the --debug option on "fossil merge" and especially on filename change tracking. ... (file: [0400cd429b] check-in: [21acce3c35] user: drh branch: trunk, size: 23387) | |
|
2011-09-01
| ||
| 23:55 | Change a couple of unlink()'s to file_delete(). ... (file: [6261aeb4a8] check-in: [61d49d92bb] user: dmitry branch: symlinks, size: 23364) | |
| 23:44 | Fix indentation in update.c. ... (file: [2131b2bd04] check-in: [1d54dce41e] user: dmitry branch: symlinks, size: 23359) | |
|
2011-08-25
| ||
| 11:42 | Introduce constants for internal permissions (executable/symlink). ... (file: [4d81a5a41b] check-in: [f6daee3e7b] user: dmitry branch: symlinks, size: 23273) | |
|
2011-08-23
| ||
| 17:44 | Fill islink field in vfile table when adding files. Support symlinks in export. Make manifest_file_perm() return 2 for symlinks. Add file_perm() function, and use it instead of file_isexe() when we need both isexe and islink properties. ... (file: [564e0cac54] check-in: [4619361d58] user: dmitry branch: symlinks, size: 23259) | |
|
2011-08-22
| ||
| 22:20 | Merge trunk. ... (file: [1150e5c23a] check-in: [c57830bec2] user: dmitry branch: symlinks, size: 23338) | |
| 18:25 | Merge the --showfiles enhancement from the venks-emacs branch into trunk. ... (file: [ede0e874be] check-in: [2b8cbf3c41] user: drh branch: trunk, size: 22052) | |
| 15:55 | Continue with the update routine even if the targetted version equals the current checkout version instead of depending on the value of the verbose flag to continue or not. This fixes tkt [e8a10100e2]. Fossil update will now recover lost files with or without the -v flag. ... (file: [26c2e35f77] check-in: [c6b371c46c] user: martin.weber branch: msw-hack, size: 22049) | |
|
2011-08-19
| ||
| 23:27 | Add a -showfiles flag to timeline. fossil ... -showfiles will now print a list of files after the checkin comment, like the "Show Files" button in the Web GUI. The format of the printed lines is the same as update. ... (file: [ca610c64cc] check-in: [b14ab41ff8] user: venkat branch: venks-emacs, size: 22118) | |
|
2011-08-14
| ||
| 17:54 | Remove the seperate versionable version of db_get(), which now uses ctrlSettings to determine whether a setting is versionable or not. ... (file: [ed2a6d415a] check-in: [3113f7b18f] user: ben branch: ben-testing, size: 22115) | |
|
2011-06-18
| ||
| 17:00 | Merge latest changes from trunk ... (file: [7c8216caa9] check-in: [7bbeb88205] user: ben branch: ben-testing, size: 22135) | |
|
2011-06-06
| ||
| 17:17 | When setting execute permission only set it for those users that also have read permission. ... (file: [6eca7cb537] check-in: [fd6f1c5e61] user: drh branch: trunk, size: 20368) | |
| 17:15 | Bug fix: make sure "fossil update" sets the execute permission bit correctly. ... (file: [b47d423a19] check-in: [37c231b11d] user: drh branch: trunk, size: 20363) | |
|
2011-06-02
| ||
| 23:45 | Minor code clean-ups: (1) shorten lines to less than 80 characters (2) remove C99-isms, especially intermixed code and declarations. Also merge in the moved file display fix from the trunk. ... (file: [25c3f76183] check-in: [a164b63a67] user: drh branch: ben-testing, size: 22130) | |
| 19:38 | Merge versionable settings and empty-dirs setting from versionable-settings branch ... (file: [1a9477c311] check-in: [30ebed1903] user: ben branch: ben-testing, size: 22046) | |
|
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: [03160c1ac8] check-in: [2a013f0228] user: drh branch: trunk, size: 20363) | |
|
2011-05-28
| ||
| 15:40 | Tidy up and fix implementation of empty-dirs setting. ... (file: [c3bd6aeed3] check-in: [529237a3c1] user: ben branch: versionable-settings, size: 22010) | |
|
2011-05-27
| ||
| 12:03 | Do not use strcmp() for comparison since the sort order can vary by locale. Use fossil_strcmp() instead. Ticket [3f0216560679fd41]. ... (file: [828a1d5976] check-in: [32ad9a1584] user: drh branch: trunk, size: 20341) | |
|
2011-05-22
| ||
| 09:52 | Add versionable empty-dirs setting which specifies a newline separated list of empty directories to be created after checkout and update commands. ... (file: [d7f30f5a79] check-in: [3fa5cfaec8] user: ben branch: versionable-settings, size: 21197) | |
|
2011-05-21
| ||
| 16:57 | If at the tip of the current branch but there are children in other branches, the "fossil up" command should do nothing. ... (file: [b07510de51] check-in: [1343cfad7b] user: drh branch: trunk, size: 20327) | |
| 16:52 | Add (verisionable) empty-dirs setting ... (file: [1bf4f1159c] check-in: [b21f47e967] user: ben branch: bens-expr, size: 21072) | |
| 16:45 | Print an "Internal Error" if the update command is unable to find a version to update to. ... (file: [bc17008a66] check-in: [88e9f24aff] user: drh branch: trunk, size: 20299) | |
|
2011-05-20
| ||
| 12:29 | Do not short-circuit the update command if the --verbose option is used. ... (file: [8a2c6838c0] check-in: [3b5db9a10e] user: drh branch: trunk, size: 20202) | |
|
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: [e7db57e5fe] check-in: [eea6449098] user: drh branch: windows-i18n, size: 20186) | |
|
2011-04-27
| ||
| 18:21 | Attempt to get Fossil working on windows systems that do not use UTF8 in the shell. ... (file: [e2743d381c] check-in: [e805fa8db9] user: drh branch: windows-i18n, size: 20171) | |
|
2011-04-18
| ||
| 18:25 | Make sure the "update" command always works the same with or without the -v option. Ticket [40a7d777a465]. ... (file: [31e32a9f41] check-in: [e11513631f] user: drh branch: trunk, size: 20030) | |
|
2011-02-28
| ||
| 13:26 | Fix the "revert" command so that it distinguishes between files that were added versus files imported by merge. Added files are not unlinked. Ticket [baf9b6b11e08c1]. ... (file: [99d5170cec] check-in: [157eed29f4] user: drh branch: exe-permission-fix, size: 20047) | |
| 03:26 | Try to get the "stash" command using execute permission bits correctly. Continuing work on the "revert" command - but it is still not working quite right. Ticket [baf9b6b11e08c1d0b]. ... (file: [5c506420a8] check-in: [ae3409bf49] user: drh branch: exe-permission-fix, size: 19893) | |
| 02:44 | Further changes trying to get execute permissions right for the "update" command. Ticket [baf9b6b11e08]. ... (file: [488db85abe] check-in: [55bf7a0ff2] user: drh branch: exe-permission-fix, size: 19796) | |
|
2011-02-27
| ||
| 22:22 | Untested changes trying to get execute permission to be set correctly following "update", "merge", "stash", etc. Ticket [baf9b6b11e08c1d]. This is a big mess and is going to take some time to get right. ... (file: [c402890655] check-in: [081aefde56] user: drh branch: exe-permission-fix, size: 19423) | |
| 21:45 | Fix the "revert" command so that it restores the correct execute permission to the file. Ticket [baf9b6b11e08c1] ... (file: [485608877d] check-in: [3c39caac39] user: drh branch: trunk, size: 19460) | |
|
2011-02-21
| ||
| 14:21 | Infrastructure changes toward adding graphical merging options. ... (file: [97fda09d8c] check-in: [b9abb86798] user: drh branch: trunk, size: 19465) | |
|
2011-02-18
| ||
| 22:25 | Fix a panic message in the historical_version_of_file() routine. ... (file: [aa1d1eee1b] check-in: [3b82ee5483] user: drh branch: trunk, size: 19546) | |
|
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: [73a4739ab4] check-in: [a1814d5015] user: drh branch: file-safety, size: 19447) | |
|
2011-02-07
| ||
| 17:57 | Fix issue introduced by previous fix. ... (file: [98966f52ea] check-in: [9fbc052c88] user: dmitry branch: symlinks, size: 20845) | |
| 17:50 | Fix segmentation fault in historical_version_of_file() when file has no permissions in manifest. ... (file: [23e3bee8e5] check-in: [8e4e30fb03] user: dmitry branch: symlinks, size: 20849) | |
|
2011-01-28
| ||
| 19:04 | Add symlink support for Unix. New settings flag "allow-symlinks" controls this (off by default). ... (file: [6c2a5a1b43] check-in: [ed2ef7e9a3] user: dmitry branch: symlinks, size: 20829) | |
|
2011-01-18
| ||
| 20:47 | Preserve timestamps across an "update" to reduce I/O on the next "status". Ticket [809a9612055340d06]. ... (file: [4f9c1e0d0c] check-in: [ffe1b60a36] user: drh branch: trunk, size: 19437) | |
| 18:36 | Remote the number of merge conflicts on an update. Ticket [769b4ed7b23e4cb7] ... (file: [7fafa82267] check-in: [0b8aed945e] user: drh branch: trunk, size: 19063) | |
|
2010-12-23
| ||
| 02:22 | Add new function fossil_strcmp() that works like strcmp() except that it handles NULL arguments correctly. Use fossil_strcmp() in place of strcmp() in many places in the code. ... (file: [2a9e42a28f] check-in: [31c52c7b3e] user: drh branch: trunk, size: 19035) | |
|
2010-12-18
| ||
| 20:39 | Many bug fixes while testing stash: Fix "revert" so that it updates the file status correctly. Fix several cases of "//" being used as a file separator instead of just "/". Fix undo on stash apply. Make "stash drop" undoable. Update documentation for undo and stash. ... (file: [b9e1f9505c] check-in: [8a6aa0a13f] user: drh branch: experimental, size: 19021) | |
| 18:56 | The "stash" functionality is now in place. Need to test more prior to merging into trunk. ... (file: [0e4d01c577] check-in: [22aa74dcdf] user: drh branch: experimental, size: 18764) | |
| 17:24 | Begin adding code to implement the "stash" command. The code compiles and runs but is currently incomplete. This is an incremental check-in to preserve state. (Ironically, if "stash" were working, I'd have probably just done a "stash snapshot" to capture this state, rather than an experimental branch.) ... (file: [874f4d431c] check-in: [b3dadcc4a6] user: drh branch: experimental, size: 17905) | |
| 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: [e86a8cb29c] check-in: [30981b64a4] user: drh branch: trunk, size: 17982) | |
|
2010-12-15
| ||
| 02:42 | Fix an uninitialized variable in update. ... (file: [4645bc9d23] check-in: [e3313965d3] user: drh branch: trunk, size: 17920) | |
| 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: [a9b9ecf452] check-in: [070ce24d83] user: drh branch: trunk, size: 17920) | |
|
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: [e4fa210949] check-in: [fd8698c8e0] user: drh branch: trunk, size: 17483) | |
| 00:30 | When doing a "fossil update" if there are multiple descendents but only one descendent in the same branch as current, then go to that one descendent without complaining. Ticket [33d2bf39889352f2f] ... (file: [a22ffc2b00] check-in: [4beacb6dc4] user: drh branch: trunk, size: 15341) | |
|
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: [cbe607b4f0] check-in: [e154a4386b] user: drh branch: trunk, size: 14786) | |
|
2010-11-25
| ||
| 01:52 | When attempting to "fossil update" on a closed branch, move to the end of the branch. Ticket [375e5703329a743339] ... (file: [29a23083c0] check-in: [1719815a47] user: drh branch: trunk, size: 14780) | |
|
2010-11-13
| ||
| 23:23 | Move the "updated-to:" text to the end of the display for the "update" command, and separately from the changed files by "---------". This at the request of the emacs integration effort. ... (file: [9a082870d6] check-in: [3af6cf0993] user: drh branch: trunk, size: 14711) | |
|
2010-11-11
| ||
| 22:04 | Add support for "magic" tags "ckout", "prev" and "next". Show the version updating to when performing an "update". ... (file: [a1e13d8987] check-in: [5ea9ad379d] user: drh branch: trunk, size: 14680) | |
|
2010-11-09
| ||
| 01:06 | Merge from trunk + minor changes to update.c to work with new . return from file_tree_name for fossil root. ... (file: [3361090cb7] check-in: [a9407bc82f] user: venkat branch: venks-emacs, size: 14635) | |
|
2010-11-08
| ||
| 20:04 | merge from trunk ... (file: [2c48d5ec2b] check-in: [1e801695d3] user: wolfgang branch: StvPrivateHook2, size: 14587) | |
| 19:02 | When the "update" command has a FILES argument which is the top-level directory, that is the same as having no FILES argument at all. In other words, all files are updated. ... (file: [7360e590a0] check-in: [2d1a03736a] user: drh branch: trunk, size: 14589) | |
| 06:15 | Remove stray debug fprintf. ... (file: [0975ad40c4] check-in: [69e81b0260] user: venkat branch: venks-emacs, size: 14706) | |
| 06:13 | Fossil update -n -v current on root dir now prints all files (printed none before). ... (file: [de4354724a] check-in: [cbce3e2f7c] user: venkat branch: venks-emacs, size: 14700) | |
| 00:40 | Merge in changes from the venks-emacs branch. ... (file: [e386566f92] check-in: [c01e3c1794] user: drh branch: trunk, size: 14691) | |
|
2010-11-07
| ||
| 21:11 | Patches to file.c (for mingw is_dir), finfo.c (various utilities), and update.c (for verbose/nochange), to allow integration into Emacs and IDEs. ... (file: [de4abe9912] check-in: [2a86bb65aa] user: venkat branch: venks-emacs, size: 14378) | |
|
2010-10-26
| ||
| 19:01 | merge from trunk ... (file: [3ffc6fe931] check-in: [4260bc6a22] user: wolfgang branch: StvPrivateHook2 , size: 14103) | |
|
2010-10-25
| ||
| 21:16 | The "fossil revert" command now clears merge history. Less frequent status output on rebuild. The FOSSIL_OMIT_DELTA_CKSUM_TEST compile-time option is available. ... (file: [c72272885e] check-in: [6c8ed4e147] user: drh branch: experimental, size: 14105) | |
|
2010-10-23
| ||
| 20:24 | Create or delete the manifest and manifest.uuid files when turning the manifest setting on and off. ... (file: [6d05b45a7c] check-in: [8175b57923] user: drh branch: experimental, size: 14076) | |
|
2010-10-22
| ||
| 01:04 | Add some explanatory text to the update command to make it easier for new users to learn fossil. ... (file: [0ab3355eda] check-in: [858940c68e] user: bcsmith branch: ui-improvements, size: 14383) | |
|
2010-10-15
| ||
| 20:37 | Refactor the control-artifact parser. ... (file: [6c67450964] check-in: [da9fcdc95a] user: drh branch: experimental, size: 14043) | |
|
2010-10-08
| ||
| 12:18 | removed quotes from command cross references and add them in help command ... (file: [c08799a380] check-in: [b3bf08cc84] user: wolfgang branch: wolfgangHelpCmd, size: 13945) | |
| 12:02 | added cross reference links to command line help in the gui ... (file: [4591c8d839] check-in: [b76a547f1a] user: wolfgang branch: wolfgangHelpCmd, size: 13947) | |
|
2010-09-13
| ||
| 20:41 | Detect when an "update" is a no-op and exit early, without doing any work. This edit was suppose to go on trunk - it landed on wolfgangFormat2CSS by mistake. But we'll leave it here and let it go to trunk when we merge the wolfgangFormat2CSS changes... ... (file: [cafe0230c5] check-in: [db313c32ce] user: drh branch: wolfgangFormat2CSS, size: 13947) | |
|
2010-09-09
| ||
| 20:12 | timeline css skinned ... (file: [91462cf6fd] check-in: [dc8a247e74] user: wolfgang branch: wolfgangFormat2CSS, size: 13898) | |
| 13:57 | Allow checkout of versions that have neither ancestors nor children. ... (file: [02a15151cd] check-in: [4980b9a796] user: drh branch: trunk, size: 13897) | |
|
2010-08-18
| ||
| 17:27 | Allow a checkout of the very first (empty) version of a project. ... (file: [d6c61b808f] check-in: [61ca4141cc] user: drh branch: trunk, size: 13971) | |
|
2010-08-07
| ||
| 16:10 | The "fossil diff" command now accepts options --from and --to in order to do a diff between two arbitrary check-ins. ... (file: [70791703ef] check-in: [296b90a25b] user: drh branch: trunk, size: 13881) | |
|
2010-07-23
| ||
| 09:37 | Fixed various typos and omissions in help sections ... (file: [3249b7047f] check-in: [44b02c3de9] user: BMorgat branch: trunk, size: 13758) | |
|
2010-06-23
| ||
| 13:30 | Prompt the user for permission to overwrite files on "fossil open". Ticket [17389900b2e5bd816] ... (file: [19c072181b] check-in: [d778ffea81] user: drh branch: trunk, size: 13708) | |
|
2010-05-16
| ||
| 19:08 | Change from GPL to the Simplified BSD License. ... (file: [6133bab1e9] check-in: [c06edd231f] user: drh branch: clear-title, size: 13699) | |
|
2010-03-05
| ||
| 23:12 | On the "update" command, do not report a conflict if a new file has been added that does not exist in the version we are updating to. Also some cleanup to the "update" command implementation. ... (file: [871f825fe9] check-in: [c9e9fd7572] user: drh branch: trunk, size: 13975) | |
|
2010-01-31
| ||
| 17:44 | Run autosync before resolving the version name in the "update" command. In that way, if a branch is specified which has been extended by the sync, the latest version of that branch is extracted rather than the version that was latest prior to the sync. ... (file: [c134217f37] check-in: [da48c10d66] user: drh branch: trunk, size: 13846) | |
|
2010-01-14
| ||
| 16:17 | Enchance the "revert" command so that it reverts all changes when no arguments are given. It also prints a message saying that "undo" is available to undo the revert. ... (file: [ff76da018c] check-in: [eaef1a77cc] user: drh branch: trunk, size: 13846) | |
| 15:34 | If a "merge" or "update" or "revert" fails, then automatically rollback any partial changes to the filesystem. Ticket [a9722a15d2]. ... (file: [521413063f] check-in: [7c3cb28d0f] user: drh branch: trunk, size: 13080) | |
|
2009-12-20
| ||
| 02:58 | Fix an assertion fault that occurs when attempting to revert a file that is not in the repository. Ticket [3713cea2fc]. ... (file: [eb5c093f17] check-in: [2255e4e3ba] user: drh branch: trunk, size: 13024) | |
|
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: [cbdf43d095] check-in: [76f169fca6] user: drh branch: trunk, size: 13002) | |
|
2009-12-17
| ||
| 22:55 | Enhancements to the "update" command. Missing files are reverted. One or more files can be specified on the "update" command line after the VERSION and only the files named will be updated. ... (file: [68eb293803] check-in: [2d996b080e] user: drh branch: trunk, size: 12999) | |
| 21:22 | Remove the --yes option from the "revert" command. In its place, make the "revert" opration undoable. ... (file: [9671f6cd74] check-in: [7b82a73bd3] user: drh branch: trunk, size: 10929) | |
| 18:47 | If a file in the check-out is changed to something other than a file (like a directory) then raise an error when checking file signatures. Also fix a problem with the new multi-file "revert" command and add some comments to "update". ... (file: [b8775abaa9] check-in: [d861fe77fb] user: drh branch: trunk, size: 11140) | |
| 16:17 | Add --nochanges and --verbose options to the "update" command. Tickets [4d6b7d4e1] and [7a27e10f1fe]. ... (file: [af63100f92] check-in: [1d9ebd9e4a] user: drh branch: trunk, size: 10873) | |
| 14:21 | Change the "revert" command so that it will take multiple file arguments and revert each one. ... (file: [dcbce47915] check-in: [353297a149] user: drh branch: trunk, size: 10092) | |
|
2009-12-10
| ||
| 02:19 | reserve the use of brackets in stdout for artifacts ... (file: [74a2862e7d] check-in: [6ae51190cc] user: rwilson branch: trunk, size: 9957) | |
|
2009-11-06
| ||
| 01:59 | Work toward improving the "diff" command. Get the "-r" or "--from" option working. ... (file: [807405a4a8] check-in: [a51808c0a5] user: drh branch: trunk, size: 9957) | |
|
2009-11-03
| ||
| 19:43 | Alway run autosync prior to an "update" even when specifying a specific check-in to update to. ... (file: [1958612a85] check-in: [f57990b65a] user: drh branch: trunk, size: 9801) | |
|
2009-10-27
| ||
| 20:15 | Make "revert" complain about excess arguments. Ticket [36d5fbf9a4]. ... (file: [6e48a71126] check-in: [107f38dd01] user: eric branch: trunk, size: 10115) | |
|
2009-07-07
| ||
| 14:53 | Fix the "update" command so that is does not report conflicts on files that have been added to the current check-out but not yet committed. The added files are simply carried forward into the updated version. ... (file: [053193c6c1] check-in: [e124881a70] user: drh branch: trunk, size: 10114) | |
|
2009-01-20
| ||
| 16:51 | Attempting to rationalize the tagging and branching logic. The "branch" command has been resurrected and appears to work now. The "tag branch" command has been removed. Special tags "newbranch" and "closed" used to manage branches. New changes are not well-tested - use with caution. You must "rebuild" when upgrading through this version. ... (file: [e7d09d9291] check-in: [b6e22e62cf] user: drh branch: trunk, size: 9918) | |
|
2008-07-23
| ||
| 13:01 | The "extra" and "clean" commands ignore the repository file if the repository happens to be within the check-out. Ticket [c7b35be88]. ... (file: [6096612034] check-in: [2ecc407d9b] user: drh branch: trunk, size: 9915) | |
|
2008-05-14
| ||
| 02:03 | Change the spelling of "descendant" to use the -ant suffix everywhere, including in the filename "descendant.c". The adjective form can be spelled either -ant or -ent, but the noun form requires -ant, or so says American Heritage. ... (file: [cb0a6551af] check-in: [6458f020fc] user: drh branch: trunk, size: 9912) | |
|
2008-05-07
| ||
| 12:15 | Add the --proxy option to the commit and update commands. ... (file: [8e9fd979cf] check-in: [b714ab1ea7] user: drh branch: trunk, size: 9912) | |
|
2008-02-21
| ||
| 14:27 | Record whether or not files have their execute permission bit set. Set or clear the execute permission bit upon checkout. ... (file: [70dcd36640] check-in: [33c31f73cd] user: drh branch: trunk, size: 9889) | |
|
2008-02-09
| ||
| 00:11 | Issue a warning after a commit if the commit causes a fork. ... (file: [69c9aea1a1] check-in: [49b59bc559] user: drh branch: trunk, size: 10127) | |
|
2008-02-08
| ||
| 21:42 | Rename the 'clearsign' setting to 'pgp-command'. Remove the 'safemerge' setting - safemerge is on by default and cannot be disabled. ... (file: [c02445cfca] check-in: [5cc845cfeb] user: drh branch: trunk, size: 10115) | |
| 16:24 | Fail with an error if a file is outside the checkout tree. ... (file: [c2214489e0] check-in: [b3ec774ab7] user: drh branch: trunk, size: 10181) | |
|
2008-02-02
| ||
| 18:44 | fixed a minor memleak in update.c:revert_cmd() ... (file: [de06d69ffd] check-in: [22cc813f8e] user: stephan branch: trunk, size: 10237) | |
|
2007-12-04
| ||
| 01:26 | Fix the revert command so that it works from subdirectories. Other minor comment and help-text changes. ... (file: [676d19419e] check-in: [371dd6574c] user: drh branch: trunk, size: 10217) | |
|
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: [86ce400827] check-in: [36b96b8616] user: drh branch: trunk, size: 9323) | |
|
2007-09-26
| ||
| 16:20 | Cleanup of the safemerge flag on update. Override available using the --force option. ... (file: [abfa21b27a] check-in: [7eecb079ed] user: drh branch: trunk, size: 9098) | |
| 04:17 | Added safemerge option to commit, update and settings ... (file: [ca0677b5f7] check-in: [41561125cd] user: jnc branch: trunk, size: 8712) | |
| 03:37 | Added revision support to diff and revert ... (file: [1e8d7a1bd1] check-in: [574763bab9] user: jnc branch: trunk, size: 8328) | |
|
2007-09-25
| ||
| 20:23 | Updates to the autosync logic. Add the "setting" command. ... (file: [38dd8e9b10] check-in: [fff234b77c] user: drh branch: trunk, size: 8094) | |
| 06:56 | Autosync config parameter added (autosync). Setting this to 1, y or Y (or yes, Yes, yes, YES, etc...) will cause autosync's to happen during certian operations. Right now, the only operation paying attention to this is update. If autosync and you do fossil update, a pull takes place first, then an update. Others will follow (commit for one). ... (file: [ee3b58703f] check-in: [b773dda29b] user: jnc branch: trunk, size: 8093) | |
|
2007-09-24
| ||
| 17:11 | Added revert command, currently only offering revert to current version. Organized todo.txt a bit, added new bug report ... (file: [7eb6f9c777] check-in: [255bacf907] user: jnc branch: trunk, size: 7992) | |
|
2007-09-23
| ||
| 18:49 | Fixes to the timeline webpage and the "open" and "update" commands. ... (file: [c90f6451d9] check-in: [ff4cc5fae2] user: drh branch: trunk, size: 6731) | |
|
2007-09-22
| ||
| 19:03 | Bug fix in the update command. ... (file: [7b1df8d7e1] check-in: [b5d82ebd7e] user: drh branch: trunk, size: 6464) | |
| 12:38 | Timeline now responses to comment and user properties. ... (file: [07dea7ee93] check-in: [9395aba4f4] user: drh branch: trunk, size: 6356) | |
|
2007-09-13
| ||
| 03:52 | Improvements to the CLI timeline display. When an update fails due to multiple descendents, show all of the descendents in timeline format. ... (file: [6cc6e53fd7] check-in: [fcabd4774c] user: drh branch: trunk, size: 6520) | |
|
2007-09-11
| ||
| 02:25 | Add the "undo" and "redo" commands. Untested at this point so don't try to use them yet. ... (file: [f281e3565d] check-in: [a36177bcce] user: drh branch: trunk, size: 6147) | |
|
2007-08-18
| ||
| 11:42 | Added options to the "timeline" CLI command. Additional help comments. ... (file: [eb47b7b9da] check-in: [6607844a01] user: drh branch: trunk, size: 6033) | |
|
2007-08-08
| ||
| 15:30 | Do not remove files that have been edited when doing an "update". Instead, mark the files as CONFLICT. ... (file: [e7db94fb72] check-in: [fe6ee8a431] user: drh branch: trunk, size: 5877) | |
| 15:18 | Write the new manifest file to the root of the check-out tree when doing an update. ... (file: [167b4a11d3] check-in: [a040ae6e17] user: drh branch: trunk, size: 5786) | |
|
2007-07-21
| ||
| 14:10 | Initial check-in of m1 sources. ... (file: [d64d008fb6] check-in: [dbda8d6ce9] user: drh branch: trunk, size: 5761) | |