Fossil

Timeline
Login

Timeline

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

7 check-ins using file src/branch.c version 1897aaa83c

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)
2010-12-09
15:52
New cloning algorithm appears to be much faster at the cost of slightly more network bandwidth. Fully backwards compatible. Need to look at the network bandwidth issue prior to merging with trunk. Perhaps a command-line option for the clone command to select between slow-and-small or fast-and-larger. ... (Closed-Leaf check-in: 8bb8be26ca user: drh tags: experimental)