FGAddon: Difference between revisions

Jump to navigation Jump to search
91 bytes added ,  29 February 2016
→‎Private team development (git-svn): Switch to {{fgaddon source}} and {{repo link}} for the SourceForge repository paths.
(→‎Connecting an existing git repository to FGAddon: Switched to {{fgaddon source}} for the SourceForge repository path.)
(→‎Private team development (git-svn): Switch to {{fgaddon source}} and {{repo link}} for the SourceForge repository paths.)
Line 963: Line 963:


Link the empty repository to the <code>ornithopter</code> aircraft directory in the remote FGAddon repository and pull it in with:
Link the empty repository to the <code>ornithopter</code> aircraft directory in the remote FGAddon repository and pull it in with:
<syntaxhighlight lang="bash">
{{#tag:syntaxhighlight|
$ git svn init svn+ssh://<username>@svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/ornithopter
$ {{fgaddon source|cmd=git svn init|protocol=svn+ssh|login=<username>|type=svn|path=Aircraft/ornithopter|full=1}}
$ git svn fetch
$ git svn fetch
</syntaxhighlight>
| lang = "sh"
}}


Replace <code><username></code> with your SF user name.  Set up a special git-svn branch for FGAddon gatekeeping and dcommitting changes back to the repository:
Replace <code><username></code> with your SF user name.  Set up a special git-svn branch for FGAddon gatekeeping and dcommitting changes back to the repository:
Line 992: Line 993:


Finally, set up the remote git repository as a remote:
Finally, set up the remote git repository as a remote:
<syntaxhighlight lang="bash">
{{#tag:syntaxhighlight|
$ git remote add origin ssh://<username>@git.code.sf.net/u/<username>/code-ornithopter
$ {{repo link|cmd=git remote add|opt=origin|protocol=ssh|login=<username>|user=<username>|type=git|repo=code-ornithopter|full=1}}
</syntaxhighlight>
| lang = "sh"
}}


And send the master branch to the remote git repository:
And send the master branch to the remote git repository:
Line 1,007: Line 1,009:
</syntaxhighlight>
</syntaxhighlight>


The repository will be located at <span style="color: blue"><tt><nowiki>https://sourceforge.net/u/<username>/code-ornithopter/ci/master/tree/</nowiki></tt></span>.  Note that the git-svn information stored in the <code>.git/svn</code> directory will not be pushed to remote SoureForge repository, and therefore the link back to FGAddon will only be present in the local copy of the team leader.  The git-svn link can be re-established at a later point if necessary.
The repository will be located at {{#tag:span|{{#tag:tt|{{#tag:nowiki|{{repo link|user=<username>|repo=code-ornithopter|branch=master|full=1}}}}}}| style="color: blue"}}.  Note that the git-svn information stored in the <code>.git/svn</code> directory will not be pushed to remote SoureForge repository, and therefore the link back to FGAddon will only be present in the local copy of the team leader.  The git-svn link can be re-established at a later point if necessary.


===== Team setup =====
===== Team setup =====
Line 1,068: Line 1,070:


Each team member should make a clone of the private git repository:
Each team member should make a clone of the private git repository:
<syntaxhighlight lang="bash">
{{#tag:syntaxhighlight|
$ git clone ssh://<username>@git.code.sf.net/u/<username_leader>/code-ornithopter ornithopter
$ {{repo link|cmd=git clone|protocol=ssh|login=<username>|user=<username_leader>|type=git|repo=code-ornithopter|post=ornithopter|full=1}}
</syntaxhighlight>
| lang = "sh"
}}


Replace <code><username></code> with your SourceForge user name, and <code><username_leader></code> is the SourceForge user name of the team leader.
Replace <code><username></code> with your SourceForge user name, and <code><username_leader></code> is the SourceForge user name of the team leader.
Line 1,077: Line 1,080:


Alternatively, each team member can fork the git repository under your SourceForge account:
Alternatively, each team member can fork the git repository under your SourceForge account:
* Go to <span style="color: blue"><tt><nowiki>https://sourceforge.net/u/<username>/code-ornithopter/ci/master/tree/</nowiki></tt></span>, where <code><username></code> is the SourceForge user name of the team leader.
* Go to {{#tag:span|{{#tag:tt|{{#tag:nowiki|{{repo link|user=<username>|repo=code-ornithopter|branch=master|full=1}}}}}}| style="color: blue"}}, where <code><username></code> is the SourceForge user name of the team leader.
* Click on <code>Fork</code>.
* Click on <code>Fork</code>.
* Set the mount point to <code>code-ornithopter</code> and change the label as you wish.
* Set the mount point to <code>code-ornithopter</code> and change the label as you wish.

Navigation menu