Fossil

History for src/update.c
Login

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

History for src/update.c

2020-05-01
20:32
[ea0c4021] part of check-in [059cd4c6] Update help for the revert command to mention the use with directories. (check-in: [059cd4c6] user: ashepilko branch: revert-dir, size: 33543)
2020-04-30
18:20
[62f1b213] part of check-in [7252e631] Change names of the added vars to camelcase. (check-in: [7252e631] user: ashepilko branch: revert-dir, size: 33350)
08:25
[e17c2a34] part of check-in [575fe0c8] Allow a revert of current changes for the whole directory tree (check-in: [575fe0c8] user: ashepilko branch: revert-dir, size: 33354)
2020-04-02
18:56
[65025982] part of check-in [04bbb05d] Fix the "fossil revert" command so that it works even for a new --empty checkout. (check-in: [04bbb05d] user: drh branch: accordion-about-wiki, size: 32004)
2020-02-25
20:57
[fa87da57] part of check-in [1bfd760d] Implemented merge/update --keep-merge-files, per discussion at /forumpost/1407a2d73e. (check-in: [1bfd760d] user: stephan branch: merge-remove-temp-files, size: 31958)
2019-09-27
23:56
[701cbead] part of check-in [52ae3288] Added -- support to (3-way-merge, open, sqlar, stash save|snapshot, tarball, touch, undo/redo, update, zip). (check-in: [52ae3288] user: stephan branch: double-dash-flag, size: 31889)
2019-09-19
14:14
[a5b48c28] part of check-in [eb804dc6] 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. (check-in: [eb804dc6] user: drh branch: trunk, size: 31577)
2019-08-31
16:42
[19ee11b3] part of check-in [aa376391] Merge in latest from trunk. (check-in: [aa376391] user: andybradford branch: db-begin-txn-updates, size: 31571)
2019-06-13
06:15
[de5656bc] part of check-in [34fcaf82] Documented the --setmtime flag to the update command. (check-in: [34fcaf82] user: stephan branch: trunk, size: 31583)
2019-03-19
14:09
[9d1ee92c] part of check-in [6cc53548] Replace most calls to db_begin_transaction() with db_begin_write() to avoid having a reader locking during a COMMIT. (check-in: [6cc53548] user: andybradford branch: db-begin-txn-updates, size: 31390)
2019-02-26
20:35
[78f496b5] part of check-in [95b700c2] Enhance the "fossil checkout" command to that it too cleans up directories that it makes empty. (check-in: [95b700c2] user: drh branch: rmdir-on-update, size: 31402)
20:03
[855d2b53] part of check-in [3275a944] 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. (check-in: [3275a944] user: drh branch: rmdir-on-update, size: 31409)
01:22
[645be08a] part of check-in [43111aa9] 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. (check-in: [43111aa9] user: drh branch: rmdir-on-update, size: 31260)
2019-01-20
21:29
[756208a4] part of check-in [b0365238] Automatically update the VFILE and VMERGE tables when the fingerprinting detects that a repository has been replaced by clone. (check-in: [b0365238] user: drh branch: rid-renumbering, size: 30375)
2019-01-19
21:31
[0c640d7d] part of check-in [8977dfb0] 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. (check-in: [8977dfb0] user: drh branch: rid-renumbering, size: 30344)
2019-01-10
21:07
[8432046d] part of check-in [e07139a0] Store "fingerprint" and "checkout-hash" in the VVAR table whenever the working checkout changes. (check-in: [e07139a0] user: drh branch: repo-fingerprint, size: 30388)
2017-12-07
11:33
[073b3243] part of check-in [4d1ac686] Spelling typos from Debian (check-in: [4d1ac686] user: drh branch: trunk, size: 30396)
2017-11-30
17:58
[0047cc2a] part of check-in [e7767de2] 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. (check-in: [e7767de2] user: drh branch: symlink-refactor, size: 30394)
2017-05-11
10:57
[2d0e0b98] part of check-in [748ec13b] Move the "revert" command off of the main "fossil help" screen. (check-in: [748ec13b] user: drh branch: mistake, size: 30428)
2017-04-23
13:08
[c59bd1c6] part of check-in [2999c7dc] 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. (check-in: [2999c7dc] user: jan.nijtmans branch: winsymlink, size: 30389)
2017-02-01
04:51
[a66c5572] part of check-in [2f19a687] Missed one. (check-in: [2f19a687] user: mistachkin branch: noSymlinks, size: 30450)
04:49
[28ed8885] part of check-in [e4b78f20] Reverse accidental whitespace changes. (check-in: [e4b78f20] user: mistachkin branch: noSymlinks, size: 30451)
04:40
[fa62875d] part of check-in [66406ae9] 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'. (check-in: [66406ae9] user: mistachkin branch: noSymlinks, size: 30471)
02:16
[6e385136] part of check-in [85277aa3] Add the --no-symlinks global command line option. (check-in: [85277aa3] user: mistachkin branch: noSymlinks, size: 30501)
2016-11-15
23:29
[6520d390] part of check-in [f9080683] 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 (check-in: [f9080683] user: andygoth branch: trunk, size: 30386)
2016-05-31
08:17
[2dbf1a20] part of check-in [598b58a5] merge from trunk with a few tweaks for merge conflicts (check-in: [598b58a5] user: sdr branch: winsymlink, size: 28159)
2016-05-30
22:25
[8a39e240] part of check-in [d5575d14] On a merge or update, prompt to continue of autosync fails, just like is done for commit. (check-in: [d5575d14] user: drh branch: autosync-failure-prompt, size: 28210)
2016-04-01
04:04
[45677835] part of check-in [418dd7ac] The revert command no longer resets the undo state if nothing is actually reverted. Additional tests and bug fixes as well. (check-in: [418dd7ac] user: joel branch: revert, size: 30090)
2015-09-03
23:15
[bd162cb1] part of check-in [8f33e49d] Merged from trunk with a few tiny edits to make new functionality work on Windows (check-in: [8f33e49d] user: sdr branch: winsymlink, size: 28146)
2015-08-03
18:35
[404e7dae] part of check-in [0a2ebe57] Integrate andygoth-undo-redo-revert-spacing. (check-in: [0a2ebe57] user: andygoth branch: trunk, size: 28197)
2015-07-15
20:15
[2effb836] part of check-in [a50be7b8] Further enhancements to the 'undo' subsystem integration. (check-in: [a50be7b8] user: mistachkin branch: trunk, size: 28198)
19:38
[d840ca6b] part of check-in [d795eb0b] For the update command, skip calls into the 'undo' subsystem when the -n (dry-run) flag is used. (check-in: [d795eb0b] user: mistachkin branch: trunk, size: 28173)
2015-07-14
21:53
[3617021b] part of check-in [a19c1f42] 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. (check-in: [a19c1f42] user: andygoth branch: andygoth-undo-redo-revert-spacing, size: 27987)
2015-06-26
18:48
[1977156e] part of check-in [f3daf393] Merge trunk. (check-in: [f3daf393] user: andygoth branch: undo-clean, size: 28016)
2015-06-16
13:28
[6acdc89d] part of check-in [33c44fab] remove unnecessary end-of-line spacing (check-in: [33c44fab] user: jan.nijtmans branch: trunk, size: 27988)
2015-05-26
21:46
[d5f0e4b2] part of check-in [c2df31da] 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. (check-in: [c2df31da] user: mistachkin branch: mvRmHardFix, size: 27992)
2015-05-18
14:49
[e4e6c948] part of check-in [ab5b8d36] A few more harmless compiler warnings (discovered using -Wall in latest gcc) (check-in: [ab5b8d36] user: jan.nijtmans branch: trunk, size: 27986)
14:33
[27bbdc17] part of check-in [b51dcc31] Fix harmless compiler warnings. (check-in: [b51dcc31] user: drh branch: trunk, size: 28000)
13:56
[2c292c20] part of check-in [702331e0] Fix the empty-dirs property so that creates the complete path of directories, not just leaves, and so that it does not leak memory. (check-in: [702331e0] user: drh branch: trunk, size: 28012)
2015-05-17
17:55
[b9b8ccc1] part of check-in [bdb90f69] Revert inadvertent style change. (check-in: [bdb90f69] user: andygoth branch: andygoth-empty-dirs-parents, size: 28140)
17:43
[68147e24] part of check-in [1ab80be4] Create parents of empty-dirs if they don't already exist. (check-in: [1ab80be4] user: andygoth branch: andygoth-empty-dirs-parents, size: 28137)
2015-05-02
20:52
[9f0b45a5] part of check-in [1b01c1ad] Correct comment describing behavior of errCode. (check-in: [1b01c1ad] user: andygoth branch: andygoth-versioned-open, size: 28134)
2015-04-27
14:39
[38d3a2fb] part of check-in [76cd08ba] Minor spelling correction. (check-in: [76cd08ba] user: andybradford branch: sync-forkwarn, size: 28300)
2015-04-26
21:28
[139cb78d] part of check-in [4a0deae5] An alternative implementation of fork warnings that provides more detail. (check-in: [4a0deae5] user: drh branch: alternative-fork-warning, size: 28131)
17:26
[646d6585] part of check-in [fe7f6f3c] Another "fork" -> "ambigeous branch" change (check-in: [fe7f6f3c] user: jan.nijtmans branch: sync-forkwarn, size: 28300)
2015-04-10
16:35
[ec49dadf] part of check-in [11b7fa69] Display "fork" status on "fossil info", "fossil status" and related commands as well. (check-in: [11b7fa69] user: jan.nijtmans branch: update-fork-warn, size: 28297)
07:55
[9f50f852] part of check-in [32998a20] Add a warning to "fossil update" when a fork has occurred. (check-in: [32998a20] user: jan.nijtmans branch: update-fork-warn, size: 28288)
2015-03-18
16:31
[8f6781fc] part of check-in [f4c14344] Merged several months worth of trunk into the winsymlink branch. (check-in: [f4c14344] user: sdr branch: winsymlink, size: 28112)
2015-02-27
13:36
[2f07b299] part of check-in [76e77aba] 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. (check-in: [76e77aba] user: drh branch: trunk, size: 28163)
2015-02-10
08:24
[9c631a3f] part of check-in [dd94e596] Speedup handling of checked-out files: When multiple information about a file is requested (size, mtime, permission flags) only call stat() once. (check-in: [dd94e596] user: jan.nijtmans branch: trunk, size: 28159)
2015-01-15
09:28
[c9fbde26] part of check-in [080ab8cb] Remove spacings at end-of-line. No change in any functionality. (check-in: [080ab8cb] user: jan.nijtmans branch: trunk, size: 28163)
2014-10-21
15:25
[4f9b0996] part of check-in [44a160a3] merge trunk (check-in: [44a160a3] user: jan.nijtmans branch: winsymlink, size: 28078)
2014-10-20
15:01
[2f69d6a5] part of check-in [0a7e326f] 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. (check-in: [0a7e326f] user: drh branch: compile-time-print-checking, size: 28221)
2014-10-17
15:31
[0a59d9c7] part of check-in [a50c3cfd] 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. (check-in: [a50c3cfd] user: drh branch: cmdline-timeline-enhancement, size: 28103)
2014-09-25
19:21
[ccad46cd] part of check-in [9c5bbd6a] 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. (check-in: [9c5bbd6a] user: sdr branch: winsymlink, size: 27959)
2014-09-23
00:56
[cf0a530a] part of check-in [44ded27f] Merge updates from trunk. (check-in: [44ded27f] user: mistachkin branch: winsymlink, size: 27969)
2014-09-20
18:41
[ce7ae440] part of check-in [31b0a9d7] 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). (check-in: [31b0a9d7] user: sdr branch: bad-winsymlink, size: 28004)
18:32
[db6619c6] part of check-in [2d3ff7bd] Refactored symlink_create repeated block of code into a checked_symlink_create function. (check-in: [2d3ff7bd] user: sdr branch: bad-winsymlink, size: 28004)
18:11
[682331e1] part of check-in [9e0ba121] 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. (check-in: [9e0ba121] user: sdr branch: bad-winsymlink, size: 28147)
2014-09-15
02:36
[f4a971b4] part of check-in [96dc8407] Consolidate all use of the capture_case_sensitive_option() function. (check-in: [96dc8407] user: mistachkin branch: captureCaseSensitiveOption, size: 28102)
2014-07-31
20:54
[e8dc2b97] part of check-in [8ab520c5] update doc improvements from the ML. (check-in: [8ab520c5] user: stephan branch: trunk, size: 28137)
2014-07-30
15:40
[acf9039e] part of check-in [a426154b] 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..) (check-in: [a426154b] user: mgagnon branch: verify-all-options, size: 27913)
2014-07-27
23:48
[e88242df] part of check-in [4a1188d5] Fix http://permalink.gmane.org/gmane.comp.version-control.fossil-scm.user/17266 (check-in: [4a1188d5] user: jan.nijtmans branch: branch-1.29, size: 27299)
20:52
[57a8410c] part of check-in [0d8cb8e3] Proposed fix for corner-case: http://permalink.gmane.org/gmane.comp.version-control.fossil-scm.user/17266 (check-in: [0d8cb8e3] user: jan.nijtmans branch: no-initial-commit, size: 27846)
2014-07-10
09:25
[0b4a0a02] part of check-in [a44b4aa5] merge trunk (check-in: [a44b4aa5] user: jan.nijtmans branch: undo-clean, size: 27833)
2014-06-20
20:54
[ac73ea5d] part of check-in [e3df30f4] Make sure the --width option is honored by all calls into print_timeline(). (check-in: [e3df30f4] user: mistachkin branch: trunk, size: 27805)
2014-06-13
23:34
[83bf95bd] part of check-in [40d5560f] Minor code style and spacing cleanup. (check-in: [40d5560f] user: mistachkin branch: trunk, size: 27318)
2014-05-30
14:54
[37f6eb87] part of check-in [87d323d3] Allow multiple autosync attempts also for the branch and update commands. (check-in: [87d323d3] user: andybradford branch: autosync-tries, size: 27319)
2014-05-09
03:03
[68599beb] part of check-in [4cfe13e9] Correction in comment, no change in functionality. (check-in: [4cfe13e9] user: andybradford branch: per-round-trip-commit, size: 27258)
2014-05-08
05:52
[fbf294f3] part of check-in [f2adddfe] Abort update or merge operation if there is content missing from files. Add --force-missing option to allow override if desired. (check-in: [f2adddfe] user: andybradford branch: per-round-trip-commit, size: 27258)
2014-05-07
04:00
[514ca0e4] part of check-in [d02f144d] Make error message less redundant. (check-in: [d02f144d] user: andybradford branch: per-round-trip-commit, size: 26972)
2014-05-05
07:26
[383354ac] part of check-in [8478bfe2] Abort the update if autosync fails. (check-in: [8478bfe2] user: andybradford branch: per-round-trip-commit, size: 26976)
2014-04-01
18:43
[f90dabea] part of check-in [ebe97b79] 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. (check-in: [ebe97b79] user: drh branch: trunk, size: 26910)
2014-02-23
05:15
[c08d9575] part of check-in [bd0b09e5] 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.) (check-in: [bd0b09e5] user: joel branch: trunk, size: 26817)
02:14
[80b376ce] part of check-in [e66a12ec] Refactor revert command SQL slightly. (check-in: [e66a12ec] user: joel branch: trunk, size: 26806)
2014-01-08
17:40
[37748a57] part of check-in [89ad123f] Fix some remaining corner cases when having a checkout on '/'..    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 '/'. (check-in: [89ad123f] user: mgagnon branch: checkout_on_root_fix, size: 26897)
2013-10-30
09:11
[88349512] part of check-in [b725c1cf] 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. (check-in: [b725c1cf] user: jan.nijtmans branch: trunk, size: 26897)
2013-10-29
12:58
[ab8c15d3] part of check-in [11634df5] Fix existing print_timeline() calls, so they return the same output as trunk by default. (check-in: [11634df5] user: jan.nijtmans branch: timeline_cmd_dash_n_fix, size: 27014)
2013-10-26
09:06
[c02970a1] part of check-in [b2455507] Allow comment_print() to handle lines >400 characters. Add parameter "width" to print_timeline() function. (check-in: [b2455507] user: jan.nijtmans branch: trunk, size: 27013)
2013-10-25
12:42
[beb359e1] part of check-in [3710f2ac] Merge trunk. Add the "-W|--width WIDTH" option to "fossil timeline". Default is 80. (check-in: [3710f2ac] user: jan.nijtmans branch: timeline_cmd_dash_n_fix, size: 27014)
2013-10-17
12:22
[83d60b46] part of check-in [6c02f699] 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. (check-in: [6c02f699] user: jan.nijtmans branch: timeline_cmd_dash_n_fix-2, size: 27010)
2013-10-04
09:30
[6e8db8ff] part of check-in [1eb438d6] Better error-message in case of "manifest file is malformed" (check-in: [1eb438d6] user: jan.nijtmans branch: pending-review, size: 27009)
2013-09-09
13:11
[c6beda2b] part of check-in [8e50e2e7] Bug fix to "update": identify the local user correctly. Contributed by Andy Bradford. (check-in: [8e50e2e7] user: drh branch: trunk, size: 27006)
2013-08-30
03:06
[04c06e5a] part of check-in [320f1436] 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. (check-in: [320f1436] user: drh branch: trunk, size: 26989)
2013-08-26
18:23
[aa3e5ca6] part of check-in [2918effe] 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. (check-in: [2918effe] user: drh branch: trunk, size: 27005)
18:00
[ac5229fa] part of check-in [5a1d13ee] Fix typos in the "fossil update" logic. (check-in: [5a1d13ee] user: drh branch: trunk, size: 27057)
2013-07-17
12:04
[5a346144] part of check-in [5d8551bf] merge trunk (check-in: [5d8551bf] user: jan.nijtmans branch: ui-no-utf8, size: 27059)
2013-05-24
07:01
[cb54091f] part of check-in [13c7c61a] "fossil update" operates on the local filesystem, so it should have the --case-sensitive option. (check-in: [13c7c61a] user: jan.nijtmans branch: trunk, size: 27055)
2013-05-23
22:36
[2be9f807] part of check-in [a5a8d047] Fix problems with update and merge when case-sensitive is off and two different checkouts each add files that differ only in case. (check-in: [a5a8d047] user: drh branch: trunk, size: 26959)
2013-05-20
10:58
[d8d1c0d2] part of check-in [122b631c] doc fix (check-in: [122b631c] user: jan.nijtmans branch: trunk, size: 26886)
2013-05-03
13:50
[72c1678b] part of check-in [8e74f0fe] Prompt before cleaning files > 10M. Those file deletions are not undo-able. (check-in: [8e74f0fe] user: jan.nijtmans branch: undo-clean, size: 26916)
2013-04-21
21:59
[eb677221] part of check-in [0b866397] Add -n|--dry-run options to commands which already have --test or --nochange. (check-in: [0b866397] user: jan.nijtmans branch: trunk, size: 26888)
2013-03-19
10:06
[417819cb] part of check-in [af4d7804] merge trunk (still experimental) (check-in: [af4d7804] user: jan.nijtmans branch: use-blob_strip_bom, size: 26840)
2013-02-27
11:30
[780a0d7c] part of check-in [f78a487f] comment fix (check-in: [f78a487f] user: jan.nijtmans branch: use-blob_strip_bom, size: 26841)
11:26
[2bb8bcfb] part of check-in [d085eb9a] merge trunk (check-in: [d085eb9a] user: jan.nijtmans branch: use-blob_strip_bom, size: 26842)
2013-01-25
23:49
[62efa1b4] part of check-in [eef34741] Fix 'fossil revert' to fully revert renames (check-in: [eef34741] user: joel branch: trunk, size: 26837)
2013-01-07
15:03
[2600176f] part of check-in [48798b27] Fix "fossil revert" so that it works on files that have been renamed. (check-in: [48798b27] user: drh branch: trunk, size: 26303)
2012-11-20
14:28
[a2268341] part of check-in [15708574] 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. (check-in: [15708574] user: drh branch: trunk, size: 26148)
02:05
[3c1d8f71] part of check-in [407cd4c5] Show much less output on a sync operation, unless the --verbose flag is given. (check-in: [407cd4c5] user: drh branch: less-verbose-sync, size: 26112)
2012-11-06
19:47
[a155e1e9] part of check-in [76c6f8fc] Make sure that pending deletes from "fossil rm" operations are preserved across a "fossil update". (check-in: [76c6f8fc] user: drh branch: branch-1.19, size: 22714)
19:42
[5d56ff23] part of check-in [28272fa1] Make sure that pending deletes from "fossil rm" operations are preserved across a "fossil update". (check-in: [28272fa1] user: drh branch: trunk, size: 26116)
2012-11-05
21:10
[818535fc] part of check-in [cd2c0e4c] 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. (check-in: [cd2c0e4c] user: drh branch: trunk, size: 25653)
13:56
[94fa9843] part of check-in [b0e05a90] merge trunk (check-in: [b0e05a90] user: jan.nijtmans branch: use-blob_strip_bom, size: 25583)
2012-11-04
12:59
[3ec1a8a0] part of check-in [45065c5c] Fix typos. (check-in: [45065c5c] user: dmitry branch: spelling, size: 25578)
2012-10-30
15:18
[f28a3684] part of check-in [879d1e24] working utf-16 diff, still being tested (check-in: [879d1e24] user: jan.nijtmans branch: use-blob_strip_bom, size: 25584)
2012-10-24
19:08
[d90c6bde] part of check-in [d4bdac3c] Fix the --setmtime flag on fossil-commit so that it works when changing version, and not just when updating the current version. (check-in: [d4bdac3c] user: drh branch: branch-1.19, size: 22238)
19:04
[8fe7d392] part of check-in [1d3256cb] Fix the --setmtime flag on fossil-commit so that it works when changing version, and not just when updating the current version. (check-in: [1d3256cb] user: drh branch: trunk, size: 25577)
2012-10-11
19:45
[c5ae742a] part of check-in [773c6c5f] 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. (check-in: [773c6c5f] user: drh branch: branch-1.19, size: 22238)
19:22
[27cd294b] part of check-in [ae092ec6] 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. (check-in: [ae092ec6] user: drh branch: trunk, size: 25577)
2012-10-05
20:39
[a20da9ef] part of check-in [4e0e69f6] Add the "stash show" command. Simplifications to the diff code, and especially the looks_like_binary() function. (check-in: [4e0e69f6] user: drh branch: trunk, size: 25391)
2012-09-30
06:25
[1470978c] part of check-in [c50eb507] 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. (check-in: [c50eb507] user: mistachkin branch: diffBinExternal, size: 25421)
2012-09-06
10:23
[5b74d4f9] part of check-in [3db1cf69] Show the number of changes following a "fossil update". (check-in: [3db1cf69] user: drh branch: trunk, size: 25216)
2012-08-29
13:57
[5b580dfe] part of check-in [9f6abc59] Allow UTF-8 characters in sources. translate.exe will translate it to ASCII (check-in: [9f6abc59] user: jan.nijtmans branch: msvc-broken, size: 24872)
2012-06-29
15:59
[81fa24df] part of check-in [0328d681] Update to the latest SQLite4 that requires converting preprocessor macro prefixes from "SQLITE_" to "SQLITE4_". (check-in: [0328d681] user: drh branch: sqlite4, size: 24877)
2012-06-27
12:30
[f925c673] part of check-in [68239127] 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. (check-in: [68239127] user: drh branch: sqlite4, size: 24873)
2012-06-11
17:33
[a2bfca11] part of check-in [7a57ab64] merge trunk again... (previous merge was not from latest trunk from fossil-scm.org) (check-in: [7a57ab64] user: mgagnon branch: mgagnon_fix, size: 24915)
2012-04-06
17:24
[bee8c866] part of check-in [195517a9] (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. (check-in: [195517a9] user: drh branch: trunk, size: 24873)
2012-03-29
14:54
[ebfa8b76] part of check-in [a496d8e8] Add vim modline everywhere (check-in: [a496d8e8] user: mgagnon branch: mgagnon_fix, size: 24396)
2012-03-01
13:40
[bdb27e27] part of check-in [471044f6] Leave the -original, -baseline, and -merge files around when an update or merge conflicts due to binary files. (check-in: [471044f6] user: drh branch: trunk, size: 24354)
2012-02-10
18:02
[fc67e0f3] part of check-in [587dd57f] 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. (check-in: [587dd57f] user: martin.weber branch: msw-docco, size: 24352)
2012-02-09
13:55
[8fd7f7d6] part of check-in [be10939b] Experimental changes to the "update" command to have it report when it makes no changes to the repository. (check-in: [be10939b] user: drh branch: experimental, size: 24267)
2012-02-03
17:00
[bf4a87ca] part of check-in [b18a178d] Fix oversize lines in the update.c source file. (check-in: [b18a178d] user: drh branch: trunk, size: 23919)
2011-12-06
00:09
[e9bc0147] part of check-in [9c90b0f0] 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. (check-in: [9c90b0f0] user: drh branch: trunk, size: 23775)
2011-10-17
23:12
[cd953276] part of check-in [c80ee413] Fix typo in warning message. (check-in: [c80ee413] user: drh branch: trunk, size: 23775)
01:12
[627f46f0] part of check-in [39f979b0] 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. (check-in: [39f979b0] user: drh branch: trunk, size: 23776)
2011-10-14
20:25
[95511562] part of check-in [60c6197c] Making fossil warn about a conflict, if an update operation overwrites an extra file. This should close ticket [953031915f]. (check-in: [60c6197c] user: viriketo branch: declined, size: 23575)
2011-10-12
17:41
[228b51f0] part of check-in [9fe787ec] 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. (check-in: [9fe787ec] user: viriketo branch: extended_ci_names, size: 23422)
2011-09-27
19:15
[c01f2167] part of check-in [f1329470] Change a few instances of file_isdir() to file_wd_isdir(). (check-in: [f1329470] user: dmitry branch: trunk, size: 23420)
2011-09-15
00:54
[54de7010] part of check-in [17f21f24] Further progress towards jerusalem on yet another holy docco crusade! Checkin #3/n (check-in: [17f21f24] user: martin.weber branch: msw-docco, size: 23847)
2011-09-08
11:59
[fc6895cf] part of check-in [8a0c5469] 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(). (check-in: [8a0c5469] user: dmitry branch: symlinks, size: 23414)
2011-09-02
16:19
[90bd6288] part of check-in [0b93b0f9] Do a better job of merging branches that contain lots of file renames. (check-in: [0b93b0f9] user: drh branch: trunk, size: 23390)
13:51
[0400cd42] part of check-in [21acce3c] Add additional trace output with the --debug option on "fossil merge" and especially on filename change tracking. (check-in: [21acce3c] user: drh branch: trunk, size: 23387)
2011-09-01
23:55
[6261aeb4] part of check-in [61d49d92] Change a couple of unlink()'s to file_delete(). (check-in: [61d49d92] user: dmitry branch: symlinks, size: 23364)
23:44
[2131b2bd] part of check-in [1d54dce4] Fix indentation in update.c. (check-in: [1d54dce4] user: dmitry branch: symlinks, size: 23359)
2011-08-25
11:42
[4d81a5a4] part of check-in [f6daee3e] Introduce constants for internal permissions (executable/symlink). (check-in: [f6daee3e] user: dmitry branch: symlinks, size: 23273)
2011-08-23
17:44
[564e0cac] part of check-in [4619361d] 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. (check-in: [4619361d] user: dmitry branch: symlinks, size: 23259)
2011-08-22
22:20
[1150e5c2] part of check-in [c57830be] Merge trunk. (check-in: [c57830be] user: dmitry branch: symlinks, size: 23338)
18:25
[ede0e874] part of check-in [2b8cbf3c] Merge the --showfiles enhancement from the venks-emacs branch into trunk. (check-in: [2b8cbf3c] user: drh branch: trunk, size: 22052)
15:55
[26c2e35f] part of check-in [c6b371c4] 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. (check-in: [c6b371c4] user: martin.weber branch: msw-hack, size: 22049)
2011-08-19
23:27
[ca610c64] part of check-in [b14ab41f] 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. (check-in: [b14ab41f] user: venkat branch: venks-emacs, size: 22118)
2011-08-14
17:54
[ed2a6d41] part of check-in [3113f7b1] Remove the seperate versionable version of db_get(), which now uses ctrlSettings to determine whether a setting is versionable or not. (check-in: [3113f7b1] user: ben branch: ben-testing, size: 22115)
2011-06-18
17:00
[7c8216ca] part of check-in [7bbeb882] Merge latest changes from trunk (check-in: [7bbeb882] user: ben branch: ben-testing, size: 22135)
2011-06-06
17:17
[6eca7cb5] part of check-in [fd6f1c5e] When setting execute permission only set it for those users that also have read permission. (check-in: [fd6f1c5e] user: drh branch: trunk, size: 20368)
17:15
[b47d423a] part of check-in [37c231b1] Bug fix: make sure "fossil update" sets the execute permission bit correctly. (check-in: [37c231b1] user: drh branch: trunk, size: 20363)
2011-06-02
23:45
[25c3f761] part of check-in [a164b63a] 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. (check-in: [a164b63a] user: drh branch: ben-testing, size: 22130)
19:38
[1a9477c3] part of check-in [30ebed19] Merge versionable settings and empty-dirs setting from versionable-settings branch (check-in: [30ebed19] user: ben branch: ben-testing, size: 22046)
2011-06-01
22:32
[03160c1a] part of check-in [2a013f02] 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]. (check-in: [2a013f02] user: drh branch: trunk, size: 20363)
2011-05-28
15:40
[c3bd6aee] part of check-in [529237a3] Tidy up and fix implementation of empty-dirs setting. (check-in: [529237a3] user: ben branch: versionable-settings, size: 22010)
2011-05-27
12:03
[828a1d59] part of check-in [32ad9a15] Do not use strcmp() for comparison since the sort order can vary by locale. Use fossil_strcmp() instead. Ticket [3f0216560679fd41]. (check-in: [32ad9a15] user: drh branch: trunk, size: 20341)
2011-05-22
09:52
[d7f30f5a] part of check-in [3fa5cfae] Add versionable empty-dirs setting which specifies a newline separated list of empty directories to be created after checkout and update commands. (check-in: [3fa5cfae] user: ben branch: versionable-settings, size: 21197)
2011-05-21
16:57
[b07510de] part of check-in [1343cfad] If at the tip of the current branch but there are children in other branches, the "fossil up" command should do nothing. (check-in: [1343cfad] user: drh branch: trunk, size: 20327)
16:52
[1bf4f115] part of check-in [b21f47e9] Add (verisionable) empty-dirs setting (check-in: [b21f47e9] user: ben branch: bens-expr, size: 21072)
16:45
[bc17008a] part of check-in [88e9f24a] Print an "Internal Error" if the update command is unable to find a version to update to. (check-in: [88e9f24a] user: drh branch: trunk, size: 20299)
2011-05-20
12:29
[8a2c6838] part of check-in [3b5db9a1] Do not short-circuit the update command if the --verbose option is used. (check-in: [3b5db9a1] user: drh branch: trunk, size: 20202)
2011-05-02
13:31
[e7db57e5] part of check-in [eea64490] Change calls to unlink() into file_delete(). The file_delete() routine converts filenames to MBCS from UTF if necessary. (check-in: [eea64490] user: drh branch: windows-i18n, size: 20186)
2011-04-27
18:21
[e2743d38] part of check-in [e805fa8d] Attempt to get Fossil working on windows systems that do not use UTF8 in the shell. (check-in: [e805fa8d] user: drh branch: windows-i18n, size: 20171)
2011-04-18
18:25
[31e32a9f] part of check-in [e1151363] Make sure the "update" command always works the same with or without the -v option. Ticket [40a7d777a465]. (check-in: [e1151363] user: drh branch: trunk, size: 20030)
2011-02-28
13:26
[99d5170c] part of check-in [157eed29] 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]. (check-in: [157eed29] user: drh branch: exe-permission-fix, size: 20047)
03:26
[5c506420] part of check-in [ae3409bf] 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]. (check-in: [ae3409bf] user: drh branch: exe-permission-fix, size: 19893)
02:44
[488db85a] part of check-in [55bf7a0f] Further changes trying to get execute permissions right for the "update" command. Ticket [baf9b6b11e08]. (check-in: [55bf7a0f] user: drh branch: exe-permission-fix, size: 19796)
2011-02-27
22:22
[c4028906] part of check-in [081aefde] 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. (check-in: [081aefde] user: drh branch: exe-permission-fix, size: 19423)
21:45
[48560887] part of check-in [3c39caac] Fix the "revert" command so that it restores the correct execute permission to the file. Ticket [baf9b6b11e08c1] (check-in: [3c39caac] user: drh branch: trunk, size: 19460)
2011-02-21
14:21
[97fda09d] part of check-in [b9abb867] Infrastructure changes toward adding graphical merging options. (check-in: [b9abb867] user: drh branch: trunk, size: 19465)
2011-02-18
22:25
[aa1d1eee] part of check-in [3b82ee54] Fix a panic message in the historical_version_of_file() routine. (check-in: [3b82ee54] user: drh branch: trunk, size: 19546)
2011-02-12
13:38
[73a4739a] part of check-in [a1814d50] 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. (check-in: [a1814d50] user: drh branch: file-safety, size: 19447)
2011-02-07
17:57
[98966f52] part of check-in [9fbc052c] Fix issue introduced by previous fix. (check-in: [9fbc052c] user: dmitry branch: symlinks, size: 20845)
17:50
[23e3bee8] part of check-in [8e4e30fb] Fix segmentation fault in historical_version_of_file() when file has no permissions in manifest. (check-in: [8e4e30fb] user: dmitry branch: symlinks, size: 20849)
2011-01-28
19:04
[6c2a5a1b] part of check-in [ed2ef7e9] Add symlink support for Unix. New settings flag "allow-symlinks" controls this (off by default). (check-in: [ed2ef7e9] user: dmitry branch: symlinks, size: 20829)
2011-01-18
20:47
[4f9c1e0d] part of check-in [ffe1b60a] Preserve timestamps across an "update" to reduce I/O on the next "status". Ticket [809a9612055340d06]. (check-in: [ffe1b60a] user: drh branch: trunk, size: 19437)
18:36
[7fafa822] part of check-in [0b8aed94] Remote the number of merge conflicts on an update. Ticket [769b4ed7b23e4cb7] (check-in: [0b8aed94] user: drh branch: trunk, size: 19063)
2010-12-23
02:22
[2a9e42a2] part of check-in [31c52c7b] 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. (check-in: [31c52c7b] user: drh branch: trunk, size: 19035)
2010-12-18
20:39
[b9e1f950] part of check-in [8a6aa0a1] 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. (check-in: [8a6aa0a1] user: drh branch: experimental, size: 19021)
18:56
[0e4d01c5] part of check-in [22aa74dc] The "stash" functionality is now in place. Need to test more prior to merging into trunk. (check-in: [22aa74dc] user: drh branch: experimental, size: 18764)
17:24
[874f4d43] part of check-in [b3dadcc4] 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.) (check-in: [b3dadcc4] user: drh branch: experimental, size: 17905)
14:18
[e86a8cb2] part of check-in [30981b64] 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. (check-in: [30981b64] user: drh branch: trunk, size: 17982)
2010-12-15
02:42
[4645bc9d] part of check-in [e3313965] Fix an uninitialized variable in update. (check-in: [e3313965] user: drh branch: trunk, size: 17920)
01:49
[a9b9ecf4] part of check-in [070ce24d] 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. (check-in: [070ce24d] user: drh branch: trunk, size: 17920)
2010-12-14
15:44
[e4fa2109] part of check-in [fd8698c8] Simplifications to the merge and update logic. Fix update so that it correctly carries file edits across name changes. (check-in: [fd8698c8] user: drh branch: trunk, size: 17483)
00:30
[a22ffc2b] part of check-in [4beacb6d] 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] (check-in: [4beacb6d] user: drh branch: trunk, size: 15341)
2010-12-08
21:00
[cbe607b4] part of check-in [e154a438] Add the --sha1sum option to the "status" and "changes" commands to force a detailed (but slow) SHA1 checksum verification that files have not changed. (check-in: [e154a438] user: drh branch: trunk, size: 14786)
2010-11-25
01:52
[29a23083] part of check-in [1719815a] When attempting to "fossil update" on a closed branch, move to the end of the branch. Ticket [375e5703329a743339] (check-in: [1719815a] user: drh branch: trunk, size: 14780)
2010-11-13
23:23
[9a082870] part of check-in [3af6cf09] 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. (check-in: [3af6cf09] user: drh branch: trunk, size: 14711)
2010-11-11
22:04
[a1e13d89] part of check-in [5ea9ad37] Add support for "magic" tags "ckout", "prev" and "next". Show the version updating to when performing an "update". (check-in: [5ea9ad37] user: drh branch: trunk, size: 14680)
2010-11-09
01:06
[3361090c] part of check-in [a9407bc8] Merge from trunk + minor changes to update.c to work with new . return from file_tree_name for fossil root. (check-in: [a9407bc8] user: venkat branch: venks-emacs, size: 14635)
2010-11-08
20:04
[2c48d5ec] part of check-in [1e801695] merge from trunk (check-in: [1e801695] user: wolfgang branch: StvPrivateHook2, size: 14587)
19:02
[7360e590] part of check-in [2d1a0373] 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. (check-in: [2d1a0373] user: drh branch: trunk, size: 14589)
06:15
[0975ad40] part of check-in [69e81b02] Remove stray debug fprintf. (check-in: [69e81b02] user: venkat branch: venks-emacs, size: 14706)
06:13
[de435472] part of check-in [cbce3e2f] Fossil update -n -v current on root dir now prints all files (printed none before). (check-in: [cbce3e2f] user: venkat branch: venks-emacs, size: 14700)
00:40
[e386566f] part of check-in [c01e3c17] Merge in changes from the venks-emacs branch. (check-in: [c01e3c17] user: drh branch: trunk, size: 14691)
2010-11-07
21:11
[de4abe99] part of check-in [2a86bb65] 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. (check-in: [2a86bb65] user: venkat branch: venks-emacs, size: 14378)
2010-10-26
19:01
[3ffc6fe9] part of check-in [4260bc6a] merge from trunk (check-in: [4260bc6a] user: wolfgang branch: StvPrivateHook2 , size: 14103)
2010-10-25
21:16
[c7227288] part of check-in [6c8ed4e1] 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. (check-in: [6c8ed4e1] user: drh branch: experimental, size: 14105)
2010-10-23
20:24
[6d05b45a] part of check-in [8175b579] Create or delete the manifest and manifest.uuid files when turning the manifest setting on and off. (check-in: [8175b579] user: drh branch: experimental, size: 14076)
2010-10-22
01:04
[0ab3355e] part of check-in [858940c6] Add some explanatory text to the update command to make it easier for new users to learn fossil. (check-in: [858940c6] user: bcsmith branch: ui-improvements, size: 14383)
2010-10-15
20:37
[6c674509] part of check-in [da9fcdc9] Refactor the control-artifact parser. (check-in: [da9fcdc9] user: drh branch: experimental, size: 14043)
2010-10-08
12:18
[c08799a3] part of check-in [b3bf08cc] removed quotes from command cross references and add them in help command (check-in: [b3bf08cc] user: wolfgang branch: wolfgangHelpCmd, size: 13945)
12:02
[4591c8d8] part of check-in [b76a547f] added cross reference links to command line help in the gui (check-in: [b76a547f] user: wolfgang branch: wolfgangHelpCmd, size: 13947)
2010-09-13
20:41
[cafe0230] part of check-in [db313c32] 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... (check-in: [db313c32] user: drh branch: wolfgangFormat2CSS, size: 13947)
2010-09-09
20:12
[91462cf6] part of check-in [dc8a247e] timeline css skinned (check-in: [dc8a247e] user: wolfgang branch: wolfgangFormat2CSS, size: 13898)
13:57
[02a15151] part of check-in [4980b9a7] Allow checkout of versions that have neither ancestors nor children. (check-in: [4980b9a7] user: drh branch: trunk, size: 13897)
2010-08-18
17:27
[d6c61b80] part of check-in [61ca4141] Allow a checkout of the very first (empty) version of a project. (check-in: [61ca4141] user: drh branch: trunk, size: 13971)
2010-08-07
16:10
[70791703] part of check-in [296b90a2] The "fossil diff" command now accepts options --from and --to in order to do a diff between two arbitrary check-ins. (check-in: [296b90a2] user: drh branch: trunk, size: 13881)
2010-07-23
09:37
[3249b704] part of check-in [44b02c3d] Fixed various typos and omissions in help sections (check-in: [44b02c3d] user: BMorgat branch: trunk, size: 13758)
2010-06-23
13:30
[19c07218] part of check-in [d778ffea] Prompt the user for permission to overwrite files on "fossil open". Ticket [17389900b2e5bd816] (check-in: [d778ffea] user: drh branch: trunk, size: 13708)
2010-05-16
19:08
[6133bab1] part of check-in [c06edd23] Change from GPL to the Simplified BSD License. (check-in: [c06edd23] user: drh branch: clear-title, size: 13699)
2010-03-05
23:12
[871f825f] part of check-in [c9e9fd75] 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. (check-in: [c9e9fd75] user: drh branch: trunk, size: 13975)
2010-01-31
17:44
[c134217f] part of check-in [da48c10d] 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. (check-in: [da48c10d] user: drh branch: trunk, size: 13846)
2010-01-14
16:17
[ff76da01] part of check-in [eaef1a77] 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. (check-in: [eaef1a77] user: drh branch: trunk, size: 13846)
15:34
[52141306] part of check-in [7c3cb28d] If a "merge" or "update" or "revert" fails, then automatically rollback any partial changes to the filesystem. Ticket [a9722a15d2]. (check-in: [7c3cb28d] user: drh branch: trunk, size: 13080)
2009-12-20
02:58
[eb5c093f] part of check-in [2255e4e3] Fix an assertion fault that occurs when attempting to revert a file that is not in the repository. Ticket [3713cea2fc]. (check-in: [2255e4e3] user: drh branch: trunk, size: 13024)
2009-12-18
00:29
[cbdf43d0] part of check-in [76f169fc] Detect when the check-out contains missing files and filesystem objects that ought to be files but are not. Issue reasonable warnings. (check-in: [76f169fc] user: drh branch: trunk, size: 13002)
2009-12-17
22:55
[68eb2938] part of check-in [2d996b08] 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. (check-in: [2d996b08] user: drh branch: trunk, size: 12999)
21:22
[9671f6cd] part of check-in [7b82a73b] Remove the --yes option from the "revert" command. In its place, make the "revert" opration undoable. (check-in: [7b82a73b] user: drh branch: trunk, size: 10929)
18:47
[b8775aba] part of check-in [d861fe77] 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". (check-in: [d861fe77] user: drh branch: trunk, size: 11140)
16:17
[af63100f] part of check-in [1d9ebd9e] Add --nochanges and --verbose options to the "update" command. Tickets [4d6b7d4e1] and [7a27e10f1fe]. (check-in: [1d9ebd9e] user: drh branch: trunk, size: 10873)
14:21
[dcbce479] part of check-in [353297a1] Change the "revert" command so that it will take multiple file arguments and revert each one. (check-in: [353297a1] user: drh branch: trunk, size: 10092)
2009-12-10
02:19
[74a2862e] part of check-in [6ae51190] reserve the use of brackets in stdout for artifacts (check-in: [6ae51190] user: rwilson branch: trunk, size: 9957)
2009-11-06
01:59
[807405a4] part of check-in [a51808c0] Work toward improving the "diff" command. Get the "-r" or "--from" option working. (check-in: [a51808c0] user: drh branch: trunk, size: 9957)
2009-11-03
19:43
[1958612a] part of check-in [f57990b6] Alway run autosync prior to an "update" even when specifying a specific check-in to update to. (check-in: [f57990b6] user: drh branch: trunk, size: 9801)
2009-10-27
20:15
[6e48a711] part of check-in [107f38dd] Make "revert" complain about excess arguments. Ticket [36d5fbf9a4]. (check-in: [107f38dd] user: eric branch: trunk, size: 10115)
2009-07-07
14:53
[053193c6] part of check-in [e124881a] 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. (check-in: [e124881a] user: drh branch: trunk, size: 10114)
2009-01-20
16:51
[e7d09d92] part of check-in [b6e22e62] 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. (check-in: [b6e22e62] user: drh branch: trunk, size: 9918)
2008-07-23
13:01
[60966120] part of check-in [2ecc407d] The "extra" and "clean" commands ignore the repository file if the repository happens to be within the check-out. Ticket [c7b35be88]. (check-in: [2ecc407d] user: drh branch: trunk, size: 9915)
2008-05-14
02:03
[cb0a6551] part of check-in [6458f020] 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. (check-in: [6458f020] user: drh branch: trunk, size: 9912)
2008-05-07
12:15
[8e9fd979] part of check-in [b714ab1e] Add the --proxy option to the commit and update commands. (check-in: [b714ab1e] user: drh branch: trunk, size: 9912)
2008-02-21
14:27
[70dcd366] part of check-in [33c31f73] Record whether or not files have their execute permission bit set. Set or clear the execute permission bit upon checkout. (check-in: [33c31f73] user: drh branch: trunk, size: 9889)
2008-02-09
00:11
[69c9aea1] part of check-in [49b59bc5] Issue a warning after a commit if the commit causes a fork. (check-in: [49b59bc5] user: drh branch: trunk, size: 10127)
2008-02-08
21:42
[c02445cf] part of check-in [5cc845cf] Rename the 'clearsign' setting to 'pgp-command'. Remove the 'safemerge' setting - safemerge is on by default and cannot be disabled. (check-in: [5cc845cf] user: drh branch: trunk, size: 10115)
16:24
[c2214489] part of check-in [b3ec774a] Fail with an error if a file is outside the checkout tree. (check-in: [b3ec774a] user: drh branch: trunk, size: 10181)
2008-02-02
18:44
[de06d69f] part of check-in [22cc813f] fixed a minor memleak in update.c:revert_cmd() (check-in: [22cc813f] user: stephan branch: trunk, size: 10237)
2007-12-04
01:26
[676d1941] part of check-in [371dd657] Fix the revert command so that it works from subdirectories. Other minor comment and help-text changes. (check-in: [371dd657] user: drh branch: trunk, size: 10217)
2007-11-16
20:42
[86ce4008] part of check-in [36b96b86] 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. (check-in: [36b96b86] user: drh branch: trunk, size: 9323)
2007-09-26
16:20
[abfa21b2] part of check-in [7eecb079] Cleanup of the safemerge flag on update. Override available using the --force option. (check-in: [7eecb079] user: drh branch: trunk, size: 9098)
04:17
[ca0677b5] part of check-in [41561125] Added safemerge option to commit, update and settings (check-in: [41561125] user: jnc branch: trunk, size: 8712)
03:37
[1e8d7a1b] part of check-in [574763ba] Added revision support to diff and revert (check-in: [574763ba] user: jnc branch: trunk, size: 8328)
2007-09-25
20:23
[38dd8e9b] part of check-in [fff234b7] Updates to the autosync logic. Add the "setting" command. (check-in: [fff234b7] user: drh branch: trunk, size: 8094)
06:56
[ee3b5870] part of check-in [b773dda2] 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). (check-in: [b773dda2] user: jnc branch: trunk, size: 8093)
2007-09-24
17:11
[7eb6f9c7] part of check-in [255bacf9] Added revert command, currently only offering revert to current version. Organized todo.txt a bit, added new bug report (check-in: [255bacf9] user: jnc branch: trunk, size: 7992)
2007-09-23
18:49
[c90f6451] part of check-in [ff4cc5fa] Fixes to the timeline webpage and the "open" and "update" commands. (check-in: [ff4cc5fa] user: drh branch: trunk, size: 6731)
2007-09-22
19:03
[7b1df8d7] part of check-in [b5d82ebd] Bug fix in the update command. (check-in: [b5d82ebd] user: drh branch: trunk, size: 6464)
12:38
[07dea7ee] part of check-in [9395aba4] Timeline now responses to comment and user properties. (check-in: [9395aba4] user: drh branch: trunk, size: 6356)
2007-09-13
03:52
[6cc6e53f] part of check-in [fcabd477] Improvements to the CLI timeline display. When an update fails due to multiple descendents, show all of the descendents in timeline format. (check-in: [fcabd477] user: drh branch: trunk, size: 6520)
2007-09-11
02:25
[f281e356] part of check-in [a36177bc] Add the "undo" and "redo" commands. Untested at this point so don't try to use them yet. (check-in: [a36177bc] user: drh branch: trunk, size: 6147)
2007-08-18
11:42
[eb47b7b9] part of check-in [6607844a] Added options to the "timeline" CLI command. Additional help comments. (check-in: [6607844a] user: drh branch: trunk, size: 6033)
2007-08-08
15:30
[e7db94fb] part of check-in [fe6ee8a4] Do not remove files that have been edited when doing an "update". Instead, mark the files as CONFLICT. (check-in: [fe6ee8a4] user: drh branch: trunk, size: 5877)
15:18
[167b4a11] part of check-in [a040ae6e] Write the new manifest file to the root of the check-out tree when doing an update. (check-in: [a040ae6e] user: drh branch: trunk, size: 5786)
2007-07-21
14:10
[d64d008f] part of check-in [dbda8d6c] Initial check-in of m1 sources. (check-in: [dbda8d6c] user: drh branch: trunk, size: 5761) Added