Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
14 check-ins using file src/undo.c version c78fcb26fb
|
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 | |