Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
36 check-ins using file src/diffcmd.c version 8fd73518ef
|
2010-12-18
| ||
| 20:54 | Fix a couple of out-of-order variable declarations. check-in: 4a8b4210f7 user: drh tags: experimental | |
| 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. check-in: 8a6aa0a13f user: drh tags: experimental | |
| 18:56 | The "stash" functionality is now in place. Need to test more prior to merging into trunk. check-in: 22aa74dcdf user: drh tags: experimental | |
| 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.) check-in: b3dadcc4a6 user: drh tags: experimental | |
| 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. check-in: 30981b64a4 user: drh tags: trunk | |
| 01:46 | Fix the tag propagator so that when a non-propagating tag overrides a propagating tag, the propagation is undo. Ticket [fcadf658ed282b3a2] check-in: 6007b2075c user: drh tags: trunk | |
| 01:38 | Fix the check-in editor so that it does not try to change the date on every edit of the check-in, but only on edits that actually change the date. check-in: b230721eb8 user: drh tags: trunk | |
|
2010-12-17
| ||
| 21:06 | In the check-in property editor, change the bgcolor tag even if the only change is to toggle color propagation on or off. Ticket [fcadf658ed282b3a2]. check-in: 2080d52168 user: drh tags: trunk | |
| 12:41 | When "fossil set editor" is unset and when there is no EDITOR or VISUAL environment variable set, then gather the check-in comment from standard input (with appropriate prompting) rather than trying to run "ed" or "notepad". check-in: aa929c4d1e user: drh tags: trunk | |
| 12:13 | Issue a warning to the user before using "ed" or "notepad" if no default text editor is set. check-in: 115d90d8b0 user: drh tags: trunk | |
| 12:03 | Remember which database was opened first (as the "main" database) in the g.zMainDbType global variable. check-in: 99f52f3806 user: drh tags: trunk | |
|
2010-12-16
| ||
| 15:03 | Tweaks to the merge conflict notation. check-in: bf919337bb user: drh tags: trunk | |
| 14:46 | Use relative URLs for hyperlinks whereever possible, so that Fossil can work better behind a reverse proxy. check-in: daeb10f65f user: drh tags: trunk | |
|
2010-12-15
| ||
| 02:42 | Fix an uninitialized variable in update. check-in: e3313965d3 user: drh tags: trunk | |
| 02:19 | Make three new TH1 variables available the footer on /doc pages: $doc_name, $doc_version, and $doc_date. check-in: 1b0e6c0fbb user: drh tags: trunk | |
| 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. check-in: 070ce24d83 user: drh tags: trunk | |
| 01:36 | Change the merge conflict marks to identify which part is original content and which part is the content merged in. check-in: 76ae862ec9 user: drh tags: trunk | |
|
2010-12-14
| ||
| 15:44 | Simplifications to the merge and update logic. Fix update so that it correctly carries file edits across name changes. check-in: fd8698c8e0 user: drh tags: trunk | |
| 00:36 | Merge in the experimental clone speed enhancement. check-in: 3543ed62bb user: drh tags: trunk | |
| 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] check-in: 4beacb6dc4 user: drh tags: trunk | |
| 00:15 | Do not show a hex dump by default when viewing a binary artifact. Instead, just say that the artifact contains binary data and give a "Hex" submenu to view the hex if that is what the user wants. Ticket [a470443b64412d2856]. check-in: dbb02ff1f9 user: drh tags: trunk | |
| 00:06 | Another bug fix associating with merges of branches which contain file name changes. check-in: 4c95b7b950 user: drh tags: trunk | |
|
2010-12-13
| ||
| 23:50 | Fix to the fix to the mtime race condition that was supposed to be fixed by the prior check-in. check-in: fa5302c28d user: drh tags: trunk | |
| 23:04 | Fix a long-standing mtime race condition that can cause problems if a "merge" takes places within the same second as an "update". check-in: af365579e7 user: drh tags: trunk | |
| 20:17 | Get "fossil undo" working on merges that involve name changes. check-in: 5d42fe9fee user: drh tags: trunk | |
| 20:12 | Futher enhancements to merge: Correct merging happens even on files whose names have changed since the pivot. check-in: c52927c76d user: drh tags: trunk | |
| 15:45 | Add logic for computing the closure of file name changes across a sequence of checkins. check-in: 28aa0e3670 user: drh tags: trunk | |
| 14:31 | Add the (unsupported) test-shortest-path command for finding the shortest path between two checkins in the DAG. check-in: c49ee72b09 user: drh tags: trunk | |
| 13:21 | Take into account local (uncommitted) changes when doing a merge. check-in: 7ec43ccb7a user: drh tags: trunk | |
| 00:00 | A few more merge test cases added. check-in: 3f490bcbcf user: drh tags: trunk | |
|
2010-12-11
| ||
| 20:08 | When merging in a change where a file was deleted in the change, actually remove the file from the working checkout. Update the test cases to verify this is what happens. check-in: 70744b76e6 user: drh tags: trunk | |
| 16:36 | Add the --tag option to the "commit" command. Add new test cases that make use of the --tag option. Improvements to the testing infrastructure. check-in: 9d723c57ea user: drh tags: trunk | |
| 00:28 | Update the git fast-export importer so that it is able to handle filenames with spaces - or at least to the extent that the fast-export format is able to deal with such filename. Ticket [4ee4aa5a30733a] check-in: 35aa6f8188 user: drh tags: trunk | |
|
2010-12-10
| ||
| 22:02 | Create a single subroutine that determines whether a file is a "reserved" file used by Fossil itself, or is potentially a valid repository file. This processing used to be duplicated at each place where it was needed. check-in: 56d69dbd85 user: drh tags: trunk | |
| 19:28 | Do not show the "manifest" and "manifest.uuid" files as "extra" files if they are generated by Fossil. check-in: 26590b8841 user: drh tags: trunk | |
| 18:57 | Take care not to show null-diffs with the "diff" command when the checkout contains the results of a merge. Ticket [47d4e76139fd63] check-in: 34341a10b4 user: drh tags: trunk | |