Fossil

All files named ”src/update.c”
Login

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

Ancestors of file src/update.c from check-in bd0b09e50b

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-09
11:24
Merge again checkout_on_root_fix. Fix more cases when working from '/', should not affect when working normally. file: [37748a57dc] check-in: [af194dbb16] user: mgagnon branch: trunk, 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
08:42
Make option -n|--limit of "fossil timeline" now specify the number of entries, just like all other commands which have the -n|--limit option. Suggested by Martin Gagnon. file: [ab8c15d318] check-in: [6e4e16fb8c] user: jan.nijtmans branch: trunk, 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-07
07:41
Better error message in case of "manifest file (12892) is malformed". It will now give an additional line: "line ???: wrong size UUID on P-card" (or whatever other parsing error happens), and using the "-n" option it will print out the complete manifest as well. This would have made it much easier to investigate Ron Aaron's commit problem (many thanks for reporting this!), without adding special debugging code to fossil. file: [6e8db8ffa7] check-in: [ec81aee915] user: jan.nijtmans branch: trunk, 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-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-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-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
2012-11-06
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
2012-11-04
17:41
Merge the "spelling" branch into trunk, fixing a huge number of typos, mostly in comments, but occasionally in error messages or help screens. file: [3ec1a8a0ac] check-in: [db0c512767] user: drh branch: trunk, size: 25578
2012-10-24
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: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-10-02
22:59
Merge the enhancements that adds the "diff-binary" setting for passing binary files to the external diff program. file: [1470978c16] check-in: [f8339c2743] user: drh branch: trunk, 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
19:41
Allow UTF-8 characters in sources. translate.exe will translate it to ASCII file: [5b580dfeb1] check-in: [208d67675c] user: jan.nijtmans branch: trunk, size: 24872
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-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
23:03
Merge in documentation updates. file: [fc67e0f369] check-in: [75ea5ac672] user: drh branch: trunk, size: 24352
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-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-08
13:02
Merge fixes and refactoring from symlinks branch. file: [fc6895cfa6] check-in: [c05f6afaf2] user: dmitry branch: trunk, 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
12:39
Merge symlink fixes into trunk. file: [6261aeb4a8] check-in: [c97535c5d8] user: dmitry branch: trunk, size: 23364
2011-09-01
21:56
Merge the symlinks branch into trunk. file: [4d81a5a41b] check-in: [e4f1c1fe95] user: drh branch: trunk, size: 23273
2011-08-22
18:25
Merge the --showfiles enhancement from the venks-emacs branch into trunk. file: [ede0e874be] check-in: [2b8cbf3c41] user: drh branch: trunk, size: 22052
18:23
Merge the msw-hack branch into trunk. file: [26c2e35f77] check-in: [af50b29c98] user: drh branch: trunk, size: 22049
2011-08-14
23:14
Merge the ben-testing branch into trunk. file: [ed2a6d415a] check-in: [9a0c995826] user: drh branch: trunk, size: 22115
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-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-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-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: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
11:32
Merge the windows-i18n branch into the trunk. file: [e7db57e5fe] check-in: [d8ec765fac] user: drh branch: trunk, size: 20186
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
14:18
All of the execute permission bit handling appears to be working now, though beta testing would be good. Ticket [baf9b6b11e08c1]. file: [99d5170cec] check-in: [3ad119b703] user: drh branch: trunk, size: 20047
2011-02-27
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-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
21:26
Bring the "stash" enhancement into the trunk. file: [b9e1f9505c] check-in: [12a2a5eaf2] user: drh branch: trunk, size: 19021
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
17:51
Merge in the latest changes from venks-emacs. file: [3361090cb7] check-in: [7d2d1d3228] user: drh branch: trunk, size: 14635
2010-11-08
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
00:40
Merge in changes from the venks-emacs branch. file: [e386566f92] check-in: [c01e3c1794] user: drh branch: trunk, size: 14691
2010-10-26
12:51
Merge the delta-manifest enhancement into the trunk. file: [c72272885e] check-in: [d13054ce84] user: drh branch: trunk, size: 14105
2010-09-13
23:40
Merge the CSS and XHTML fixes from the wolfgangFormat2CSS branch into the trunk. file: [cafe0230c5] check-in: [3243e63bba] user: drh branch: trunk, size: 13947
2010-09-09
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:14
Pull in all clear-title changes from trunk. file: [871f825fe9] check-in: [dfb5fd64cd] user: drh branch: clear-title, size: 13975
2010-02-08
18:16
Merge recent changes into the dual-license branch. file: [c134217f37] check-in: [14c19fbc1c] user: drh branch: clear-title, 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-24
18:50
Merged to [ed26056bb5]. file: [70dcd36640] check-in: [588bb7cd73] user: aku 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-05
08:07
Merged mainline into my branch to get the newest application. file: [676d19419e] check-in: [d0305b305a] user: aku branch: trunk, size: 10217
2007-09-17
01:00
Pulled the latest CLI, website, and sqlite changes into the importer branch. file: [6cc6e53fd7] check-in: [f76192b245] user: aku branch: trunk, size: 6520
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
Added: Initial check-in of m1 sources. file: [d64d008fb6] check-in: [dbda8d6ce9] user: drh branch: trunk, size: 5761