Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
11 check-ins using file src/merge.c version 01985ecbf8
|
2010-12-18
| ||
| 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 | |