Fossil

Timeline
Login

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

8 check-ins by user nick.lloyd

2016-10-08
14:06
Fix a regression introduced in [69668f8c57] that broke export of tags. ... (Closed-Leaf check-in: b2e0fda9 user: nick.lloyd tags: nick.lloyd-git-interop)
13:42
Add missing arguments to Git->Fossil import example. ... (check-in: 880e3fb5 user: nick.lloyd tags: nick.lloyd-git-interop)
2016-09-29
17:46
Add information to inout.wiki about bidirectional synchronization with Git repos. ... (check-in: e8775afe user: nick.lloyd tags: nick.lloyd-git-interop)
17:35
Remove comment from inout.wiki about having to merge trunk into master after importing from Git repo.

This is no longer true. Fossil automatically converts references to master into trunk when importing, and vice versa when exporting. ... (check-in: 2cd0ee63 user: nick.lloyd tags: nick.lloyd-git-interop)

2016-09-21
19:05
Fix a problem that can occasionally occur with repeated syncs to/from a git repository, where a fossil-generated mark clashes with a mark previously generated by git, causing the sync to fail. ... (check-in: 69668f8c user: nick.lloyd tags: nick.lloyd-git-interop)
16:06
Merge in latest from trunk ... (check-in: 85a0ada6 user: nick.lloyd tags: nick.lloyd-git-interop)
2016-05-14
21:41
Add --import-marks and --export-marks options to 'fossil import' subcommand.

This allows one to save all git-generated marks following an import. Previously, performing an incremental import from git resulted in new commits being imported as orphans, and trying to perform an export to git at some later time resulted in git complaining of undefined marks. To remedy this, the format of the marks file is amended to include the rid, mark, and UUID of each commit. Now, fossil and git agree on the mapping between commits and marks, so updates in either direction can be performed easily. ... (check-in: c26213be user: nick.lloyd tags: nick.lloyd-git-interop)

21:01
Create new branch named "nick.lloyd-git-interop" ... (check-in: 1af797c3 user: nick.lloyd tags: nick.lloyd-git-interop)