[X2Go-Commits] page changed: wiki:development:git

wiki-admin at x2go.org wiki-admin at x2go.org
Fri Mar 15 00:30:52 CET 2013


A page in your DokuWiki was added or changed. Here are the details:

Date        : 2013/03/14 23:30
Browser     : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1
IP-Address  : 46.142.39.109
Hostname    : 109-39-142-46.pool.kielnet.net
Old Revision: http://wiki.x2go.org/doku.php/wiki:development:git?rev=1362749499
New Revision: http://wiki.x2go.org/doku.php/wiki:development:git
Edit Summary: 
User        : sunweaver

@@ -1,7 +1,7 @@
  ====== X2Go's Git Repository ======
  
- Within the X2Go project development code is shared via a public GIT repository hosted by DAS-NETZWERKTEAM in Kiel, Nothern Germany (Servers: Hetzner Online AG). For any technical X2Go GIT related questions, please contact our GIT repository administrator (currently: Mike Gabriel): ''git-admin (at) x2go (dot) org'', a discussion about content should be held on the developers' mailing list: ''x2go-dev at lists.berlios.de''.
+ Within the X2Go project development code is shared via a
public GIT repository hosted by DAS-NETZWERKTEAM in Kiel, Nothern Germany (Servers: Hetzner Online AG). For any technical X2Go Git related questions, please contact our Git repository administrator (currently: Mike Gabriel): ''git-admin (at) x2go (dot) org'', a discussion about content should be held on the developers' mailing list: ''x2go-dev at lists.berlios.de''.
  
  ===== Access =====
  
  ==== Browse the X2Go GIT repository tree in a web browser ====
@@ -25,9 +25,9 @@
  ===== Contributing to X2Go =====
  
  Before you start contributing make sure git git knows who you are, as this is added to the patches.
  
- === Setup Git Configuration ===
+ ==== Setup Git Configuration ====
  
  Now it is time to set up your system environment for working with Git. Main thing is to tell Git who you are. For this edit the file ''~/.gitconfig'' with your favourite editor and put the followings lines in it (of course, you may want to personalize some of the fields):
  
  <code>
@@ -37,23 +37,20
@@
  </code>
  
  
  
- Only project developers can access X2Go's Git tree via the SSH method. Please understand that we only restrictively grant write access to our GIT repository. However, you can send us patches via Mail (git-send-email). For submitting X2Go patches, please use this eMail address:
+ Only project developers can access X2Go's Git tree via the SSH method. Please understand that we only restrictively grant write access to our GIT repository. However, you can send us patches via Mail (git-send-email). For submitting X2Go patches, please use the [[wiki:bugs|X2Go Bug Tracker System]].
  
- <note>TODO: Write/Link howto</note>
  
-   patches at x2go.org
- 
- === Developer Git Access via SSH ===
+ ==== Developer Git Access via SSH ====
  
  
  In the instruction set below, substitute <package> with the X2Go source package that you want to work on, substitute <branch> with the name of the branch of <package> you are contributing to. The SSH <port> to use for Git write access
will be provided to developers only and will not be named in this Wiki. Access via SSH will only be granted by SSH public key authentication (no password auth).
  
    $ cd ~/x2go/<package>
    $ git push ssh://x2go@code.x2go.org:<port>/srv/git/code.x2go.org/<package> <branch>
  
- === SSH Key Fingerprints of code.x2go.org (FQDN: ymir.das-netzwerkteam.de) ===
+ ==== SSH Key Fingerprints of code.x2go.org (FQDN: ymir.das-netzwerkteam.de) ====
  
    
    RSA Key: ab:cd:4b:b2:d1:d1:19:11:ed:24:83:5a:06:b1:d4:d3
  
@@ -61,16 +58,16 @@
  
  Commits and tags in X2Go Git are posted as e-Mails to two different mailing lists:
  
    * Git commits -> x2go-commits at lists.berlios.de (https://lists.berlios.de/mailman/listinfo/x2go-commits)
-   * Git tags -> x2go-announcement at lists.berlios.de (https://lists.berlios.de/mailman/listinfo/x2go-announcement)
+   * Git tags -> x2go-tags at lists.berlios.de (https://lists.berlios.de/mailman/listinfo/x2go-tags)
  
- These mailing lists can be subscribed to by
anyone who is interested in X2Go Git changes. However, beware that there might be phases you get flooded by mails, if you subscribe to any of these lists (esp. x2go-commits). Furthermore the lists are read-only. Postings to these lists will be dropped automatically by the mailing list service. 
+ These mailing lists can be subscribed to by anyone who is interested in X2Go Git changes. However, beware that there might be phases during which you get flooded by mails. Furthermore the lists are read-only. Postings to these lists will be dropped automatically by the mailing list service. 
  
  Both mailing lists are also archived at Gmane:
  
    * [[http://blog.gmane.org/gmane.linux.terminal-server.x2go.scm|gmane.linux.terminal-server.x2go.scm]]	-- X2Go Git commit messages (read-only)
-   * [[http://blog.gmane.org/gmane.linux.terminal-server.x2go.tags|gmane.linux.terminal-server.x2go.tags]] -- X2go Git taggings (read-only)
+   *
[[http://blog.gmane.org/gmane.linux.terminal-server.x2go.tags|gmane.linux.terminal-server.x2go.tags]] -- X2Go Git taggings (read-only)
  
  ===== Snippets ====
  
  ==== Checkout all repos ====
@@ -154,11 +151,11 @@
  ; do cd $REP && git pull && cd .. ; done
  </code>
  ===== Maintenance =====
  
- <note warning>This is only for admins having access to the x2go git server.</note>
+ <note warning>This is only for admins having access to the X2Go Git server.</note>
  
- ==== Create new Git Project on X2go Git ====
+ ==== Create new Git Project on X2Go Git ====
  
  Create a local Git project:
  
  <code>
@@ -178,9 +175,9 @@
  $ rm x2gonewthing -Rfv
  $ git clone ssh://x2go@code.x2go.org:32032/srv/git/code.x2go.org/x2gonewthing.git
  </code>
  
- Now you can start working on your new X2go project as on any of the other already existing X2go Git projects.
+ Now you can start working on your new X2Go project as on any of the other already existing X2Go Git projects.
  
  ==== Edit Git
Configs ====
  
  As ''x2go-admin'' on ''code.x2go.org'':
@@ -204,22 +201,20 @@
  Unused feature, may come later...
  
  
  ===== Backyard =====
- 
- <note>Is this really needed??!</note>
  
  ==== Reverting Merge Commits ====
  
  If you forget to run ''git-pull'' before modifying code files you will run into merge problems when committing your changes.
  
- There is nothing bad about merge commits apart from the fact that the X2go Git system won't allow them being pushed to the server :-/.
+ There is nothing bad about merge commits apart from the fact that the X2Go Git system won't allow them being pushed to the server :-/.
  
  Thus, you probably want to avoid merge commits right from the beginning. However, from time to time it occurs that you crunch your Git log with a merge commit. This is how such a thing can happen:
  
    * change a file
    * commit it locally
-   * push it to X2go Git
+   * push it to X2Go Git
    * find that the push operation gets rejected :-(
    * then
run ''git-pull'' instead
    * and then uuups... realize: the ''git-pull'' fetched in some code for the same file, I have just been working on...) -> you probably forgot to run a ''git-pull'' before starting to work on that particular file...
  
@@ -247,11 +242,11 @@
  # finally drop the tmp backup of old master
  $ git branch -D master-bak-tmp
  </code>
  
- ==== Pushing to X2go Git ====
+ ==== Pushing to X2Go Git ====
  
- Whenever your local X2go Git project is in an acceptable state for the community, feel free to push the code to the X2go Git server:
+ Whenever your local X2Go Git project is in an acceptable state for the community, feel free to push the code to the X2Go Git server:
  
  <code>
  $ git push
  </code>
@@ -261,9 +256,9 @@
  
  Keeping back code for too long can result in code conflicts (changes in the same code block of the same file by two different developers).
  </note>
  
- The update scripts of X2go Git will shout warnings at you while pushing. These warnings
relate to
+ The update scripts of X2Go Git will shout warnings at you while pushing. These warnings relate to
  
    * whitespaces found at the end of lines
    * tabs found in the file (for Python: no tabs, for Bash, Perl, C++, etc. tabs are wanted, so you can ignore these if not coding Python)
    * no \newline at end of file



-- 
This mail was generated by DokuWiki at
http://wiki.x2go.org/




More information about the x2go-commits mailing list