Fossil

Check-in [2cd0ee63]
Login

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

Overview
Comment: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.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | nick.lloyd-git-interop
Files: files | file ages | folders
SHA1: 2cd0ee6388faaa02218b9530971dc6610297738a
User & Date: nick.lloyd 2016-09-29 17:35:51
Original Comment: Remove comment 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.

Context
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-23
02:46
Coding style tweaks. check-in: 32e418f8 user: mistachkin tags: nick.lloyd-git-interop
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to www/inout.wiki.

46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63

As with the "import" command, the --git option is not required
since the git-fast-export file format is currently the only VCS interchange 
format that Fossil will generate.  However,
future versions of Fossil might add the ability to generate other
VCS interchange formats, and so for compatibility, the use of the --git 
option recommended.

An anonymous user sends this comment:

<blockquote>
The main Fossil branch is called "trunk", while the main git branch is
called "master". After you've exported your FOSSIL repo to git, you won't 
see any files and gitk will complain about a missing "HEAD". You can 
resolve this problem by merging "trunk" with "master"
(first verify using git status that you are on the "master" branch): 
<tt>git merge trunk</tt>
</blockquote>







<
<
<
<
<
<
<
<
<
<
<
46
47
48
49
50
51
52












As with the "import" command, the --git option is not required
since the git-fast-export file format is currently the only VCS interchange 
format that Fossil will generate.  However,
future versions of Fossil might add the ability to generate other
VCS interchange formats, and so for compatibility, the use of the --git 
option recommended.