Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
17 check-ins related to "nick.lloyd-git-interop"
|
2016-10-26
| ||
| 21:28 | Fixes for incremental Git import/export. check-in: 27c8985cc1 user: mistachkin tags: trunk | |
|
2016-10-23
| ||
| 02:16 | Fixes for incremental Git import/export. check-in: 9599705c69 user: mistachkin tags: experimental | |
|
2016-10-08
| ||
| 14:06 | Fix a regression introduced in [69668f8c57] that broke export of tags. Closed-Leaf check-in: b2e0fda9e1 user: nick.lloyd tags: nick.lloyd-git-interop | |
| 13:42 | Add missing arguments to Git->Fossil import example. check-in: 880e3fb51f 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: e8775afe1b 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: 2cd0ee6388 user: nick.lloyd tags: nick.lloyd-git-interop | |
|
2016-09-23
| ||
| 02:46 | Coding style tweaks. check-in: 32e418f856 user: mistachkin tags: nick.lloyd-git-interop | |
| 02:40 | Merge updates from trunk. check-in: 98f4ee8f71 user: mistachkin tags: nick.lloyd-git-interop | |
| 02:10 | Clarify the exact type used for cmdFlags. check-in: 3ca2bc105a user: mistachkin tags: trunk | |
|
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: 69668f8c57 user: nick.lloyd tags: nick.lloyd-git-interop | |
| 16:06 | Merge in latest from trunk check-in: 85a0ada691 user: nick.lloyd tags: nick.lloyd-git-interop | |
| 14:13 | More typo fixes in whyusefossil.wiki. check-in: f2ce2e41d5 user: drh tags: trunk | |
|
2016-05-16
| ||
| 18:00 | Add the --import-marks and --export-marks options to "fossil import" when the --git option is used. check-in: b3acfa2e4a user: drh tags: trunk | |
| 17:58 | Remove C99-isms that MSVC has trouble with. check-in: addfe48990 user: drh 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: c26213be47 user: nick.lloyd tags: nick.lloyd-git-interop | |
| 21:01 | Create new branch named "nick.lloyd-git-interop" check-in: 1af797c337 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: 05cd9fa2bf user: rberteig tags: trunk | |