Fossil

Check-in [1af797c3]
Login

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

Overview
Comment:Create new branch named "nick.lloyd-git-interop"
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | nick.lloyd-git-interop
Files: files | file ages | folders
SHA1:1af797c337378a4c071cedf05a4680180d1e7555
User & Date: nick.lloyd 2016-05-14 21:01:56
Context
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
00:48
Collected improvements to the fossil wiki and attach commands to support technotes as well as wiki pages, including attachments to either and new test cases. Passes all tests. check-in: 05cd9fa2 user: rberteig tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch