Fossil SCM
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.
Commit
2cd0ee6388faaa02218b9530971dc6610297738a
Parent
32e418f85687d54…
1 file changed
-11
-11
| --- www/inout.wiki | ||
| +++ www/inout.wiki | ||
| @@ -48,16 +48,5 @@ | ||
| 48 | 48 | since the git-fast-export file format is currently the only VCS interchange |
| 49 | 49 | format that Fossil will generate. However, |
| 50 | 50 | future versions of Fossil might add the ability to generate other |
| 51 | 51 | VCS interchange formats, and so for compatibility, the use of the --git |
| 52 | 52 | option recommended. |
| 53 | - | |
| 54 | -An anonymous user sends this comment: | |
| 55 | - | |
| 56 | -<blockquote> | |
| 57 | -The main Fossil branch is called "trunk", while the main git branch is | |
| 58 | -called "master". After you've exported your FOSSIL repo to git, you won't | |
| 59 | -see any files and gitk will complain about a missing "HEAD". You can | |
| 60 | -resolve this problem by merging "trunk" with "master" | |
| 61 | -(first verify using git status that you are on the "master" branch): | |
| 62 | -<tt>git merge trunk</tt> | |
| 63 | -</blockquote> | |
| 64 | 53 |
| --- www/inout.wiki | |
| +++ www/inout.wiki | |
| @@ -48,16 +48,5 @@ | |
| 48 | since the git-fast-export file format is currently the only VCS interchange |
| 49 | format that Fossil will generate. However, |
| 50 | future versions of Fossil might add the ability to generate other |
| 51 | VCS interchange formats, and so for compatibility, the use of the --git |
| 52 | option recommended. |
| 53 | |
| 54 | An anonymous user sends this comment: |
| 55 | |
| 56 | <blockquote> |
| 57 | The main Fossil branch is called "trunk", while the main git branch is |
| 58 | called "master". After you've exported your FOSSIL repo to git, you won't |
| 59 | see any files and gitk will complain about a missing "HEAD". You can |
| 60 | resolve this problem by merging "trunk" with "master" |
| 61 | (first verify using git status that you are on the "master" branch): |
| 62 | <tt>git merge trunk</tt> |
| 63 | </blockquote> |
| 64 |
| --- www/inout.wiki | |
| +++ www/inout.wiki | |
| @@ -48,16 +48,5 @@ | |
| 48 | since the git-fast-export file format is currently the only VCS interchange |
| 49 | format that Fossil will generate. However, |
| 50 | future versions of Fossil might add the ability to generate other |
| 51 | VCS interchange formats, and so for compatibility, the use of the --git |
| 52 | option recommended. |
| 53 |