Source Control Management

Version 65 (Sickboy, 02/09/2009 13:35)

1 1 Sickboy
{{>toc}}
2 50 Sickboy
3 50 Sickboy
h1. SCM
4 1 Sickboy
5 1 Sickboy
Please click "Wiki" in the menu above for generic dev-heaven site help
6 15 kju
7 15 kju
*GENERAL NOTE* This wiki is based on the "Exception" rule. Please leave settings/configuration options default, unless it is explicitly listed to do otherwise.
8 1 Sickboy
9 14 kju
h2. Private and Public Key Files
10 2 Sickboy
11 1 Sickboy
To connect to a dev-heaven.net ssh host, you must authenticate with a private/public key combination.
12 61 Sickboy
Please follow the following steps to generate keys, and get access.
13 1 Sickboy
14 1 Sickboy
h3. Installation
15 1 Sickboy
16 35 Sickboy
* Install "Putty Suite":http://tartarus.org/~simon/putty-snapshots/x86/putty-installer.exe
17 37 Sickboy
* Create a Key Set with PuttyGen
18 33 Sickboy
* Save the PUBLICkey and PRIVATEkey somewhere safe on your harddrive
19 35 Sickboy
* Send PUBLICkey to admin (Guard the PRIVATEkey with your life, never share! :D)
20 36 Sickboy
** The admin will give your account the permission to the right project, and supply you with the git clone url
21 1 Sickboy
22 1 Sickboy
h3. (After any reboot) if you want to access a dev-heaven.net ssh host:
23 1 Sickboy
24 1 Sickboy
* Load your PRIVATEkey into the PageAnt application (Part of putty suite). 
25 38 Sickboy
_Incase you have a password on the PRIVATEkey, you will have to enter this everytime pageant loads your key_
26 34 Sickboy
* You are recommended to add a link to autostart with the param(s) to you key file(s).
27 7 kju
<pre>
28 41 kju
D:\Programme\Putty\pageant.exe "D:\Programme\Putty\my_private_key.ppk"
29 7 kju
</pre>
30 51 Sickboy
31 47 Sickboy
h3. First time connecting to a host
32 1 Sickboy
33 9 kju
** Open a connection with putty, to the host (e.g: git.dev-heaven.net) *DO NOT* save it!
34 1 Sickboy
*** Click YES/Accept to accept the server key
35 1 Sickboy
*** Close Putty again
36 1 Sickboy
** You should only have to do this once per host
37 47 Sickboy
38 1 Sickboy
39 45 Sickboy
h1. GIT
40 1 Sickboy
41 45 Sickboy
h2. Installation of the Core Client (MSysGit)
42 20 Sickboy
43 24 Sickboy
* (Make sure the Putty suite is installed, see top of page)
44 40 Sickboy
* Install "MSysGit":http://dev-heaven.net/projects/list_files/heaven (*Fixed Edition!* Please lookup the latest available version)
45 1 Sickboy
** It is recommended to add the Windows Explorer Extensions ("Git Gui Here", "Git Bash Here")
46 1 Sickboy
** Choose to install for *Windows Command Line* (Middle option, out of 3)
47 1 Sickboy
** Choose to use *Plink for SSH*
48 44 Sickboy
49 45 Sickboy
h2. Installation of the Interface Client(s)
50 44 Sickboy
51 52 Sickboy
There are several clients available, you can choose to use 1, or a combination of them, as you wish.
52 52 Sickboy
53 45 Sickboy
h3. Git GUI
54 44 Sickboy
55 60 Sickboy
This is part of the MsysGit Installation
56 60 Sickboy
"*Usage Help, Examples and Screenshots*":http://dev-heaven.net/wiki/heaven/Git_Gui_Guide
57 44 Sickboy
58 59 Sickboy
59 45 Sickboy
h3. Git Extensions
60 44 Sickboy
61 44 Sickboy
This client is a bit like Tortoise's client, but operates a bit differently and has a few unique features
62 56 Sickboy
* Install "Git Extensions":http://downloads.sourceforge.net/gitextensions/GitExtensions138Setup.msi?use_mirror=
63 1 Sickboy
** If you install the *Complete* Setup, please *do not* install the included MSysGit with it!!
64 1 Sickboy
** Choose to install KDiff (Only available in *Complete* Setup). You can also download & install this application seperately (google)
65 1 Sickboy
** Incase of 64-bit Windows (otherwise skip this step!), if you also want to use the Extensions in 32-bit applications (like Total Commander);
66 1 Sickboy
*** also download the .zip file
67 1 Sickboy
*** unpack the GitExtensionsShell.dll
68 33 Sickboy
*** rename it to GitExtensionsShellEx32.dll
69 39 Sickboy
*** place it in your Git Extensions installation folder
70 1 Sickboy
*** regsvr32 GitExtensionsShellEx32.dll from a dos prompt
71 1 Sickboy
* *Please Reboot*
72 1 Sickboy
* Startup the Git Extensions application, and verify that all settings are filled in. (Local Settings tab can remain empty)
73 1 Sickboy
** UserName
74 1 Sickboy
** E-mail
75 1 Sickboy
** Application Locations
76 1 Sickboy
** Favorite Editor and Diff/Merge program
77 1 Sickboy
78 58 Sickboy
"*Usage Help, Examples and Screenshots*":http://dev-heaven.net/wiki/20/GitExtensions_QuickStart
79 1 Sickboy
80 59 Sickboy
81 55 Sickboy
h3. TortoiseGit
82 55 Sickboy
83 55 Sickboy
_experimental!_
84 55 Sickboy
This client is basically TortoiseSVN but then for Git, and is very much alike the SVN version
85 55 Sickboy
86 55 Sickboy
* *BETTER NOT USE UNTIL FURTHER DEVELOPED*
87 1 Sickboy
88 63 Sickboy
h2. Handy Scripts / Tools
89 63 Sickboy
90 65 Sickboy
* "Git Remote Branching":http://github.com/webmat/git_remote_branch/tree/master Very useful script written in Ruby. Can be used to simplify managing remote branches. (create, track or remove)
91 59 Sickboy
92 1 Sickboy
h2. Initial Steps
93 1 Sickboy
94 1 Sickboy
* Please make sure your keyAgent (e.g Pageant) is running, and your private key is loaded
95 59 Sickboy
* Use interface or commandline git and clone your first repository: git clone git@git.dev-heaven.net:REPOSITORYNAME.git  (Receive repository name from admin)
96 59 Sickboy
** In case of message: "The server's host key is not cached in the registry. You have no guarantee that the server is the computer you think it is.", press y. Incase that doesn't work, first connect once to the host with Putty, and accept the hostkey.
97 1 Sickboy
98 1 Sickboy
99 45 Sickboy
h2. JumpStart
100 1 Sickboy
101 1 Sickboy
* In Git, you have a local copy of the repository
102 1 Sickboy
* If you commit, you only commit to your local repository. If you want to push your changes to the shared remote repository, you must first git pull, and then git push
103 1 Sickboy
* If you wish to fetch, you use git pull
104 1 Sickboy
* If there are things to merge, like changes to files by 2 persons, use git merge
105 9 kju
* every git command can be used with --help for basic help output
106 1 Sickboy
107 1 Sickboy
* If you wish to look at the log using the GIT Gui on your repository, you can check the Repository Menu, and Visualize master's history (or all branches)
108 1 Sickboy
* First useful "git cheat sheet":http://cheat.errtheblog.com/s/git/
109 1 Sickboy
* "Subversion commands in git ":http://git.or.cz/course/svn.html
110 1 Sickboy
111 45 Sickboy
h2. Git use
112 1 Sickboy
113 45 Sickboy
h3. Staging and Committing Changes
114 1 Sickboy
115 1 Sickboy
* If you have Git Extensions installed and properly setup, you can right click a repository and choose "Git Extensions" -> "Browse"
116 1 Sickboy
** You can use this tool to browse the repository+history
117 1 Sickboy
** You can use the "Commit" option in this tool to stage your changes and commit. It works pretty handy with the rescan changes button and other options
118 1 Sickboy
119 45 Sickboy
h3. Reverting Uncommitted Changes
120 1 Sickboy
121 1 Sickboy
* By using the Git Extensions: Browse. Then Commit
122 1 Sickboy
* If your file is already stage, unstage it
123 1 Sickboy
* Right click the file in the top file list, and choose revert changes
124 1 Sickboy
* There are more ways, like hard resetting to current head: git checkout -f (Or in the Commit dialog of Git Extensions: reset changes hard), however, this will revert ALL your currently uncommitted changes
125 1 Sickboy
126 45 Sickboy
h2. Common problems
127 6 kju
128 6 kju
<pre>
129 6 kju
Access denied
130 6 kju
FATAL ERROR: Server sent disconnect message
131 6 kju
type 2 (protocol error):
132 6 kju
"Too many authentication failures for git"
133 6 kju
</pre>
134 6 kju
135 6 kju
Usually happens when pageant aint running.
136 6 kju
Or when you installed msysgit without pointing it to putty plink.
137 6 kju
138 11 kju
<pre>
139 11 kju
You asked me to pull without telling me which branch you
140 11 kju
want to merge with, and 'branch.master.merge' in
141 11 kju
your configuration file does not tell me either.  Please
142 11 kju
name which branch you want to merge on the command line and
143 11 kju
try again (e.g. 'git pull <repository> <refspec>').
144 11 kju
See git-pull(1) for details on the refspec.
145 11 kju
146 11 kju
If you often merge with the same branch, you may want to
147 11 kju
configure the following variables in your configuration
148 11 kju
file:
149 11 kju
150 11 kju
    branch.master.remote = <nickname>
151 11 kju
    branch.master.merge = <remote-ref>
152 11 kju
    remote.<nickname>.url = <url>
153 11 kju
    remote.<nickname>.fetch = <refspec>
154 11 kju
155 11 kju
See git-config(1) for details.
156 11 kju
</pre>
157 11 kju
158 17 Sickboy
Use: git pull origin master
159 18 Sickboy
(or push)
160 18 Sickboy
161 17 Sickboy
Or setup the mentioned settings (execute from your repository folder):
162 18 Sickboy
<pre>
163 17 Sickboy
git config branch.master.remote origin
164 23 Sickboy
git config branch.master.merge refs/heads/master
165 17 Sickboy
git config remote.origin.url git@git.6thsense.eu:REPOSITORYNAME
166 23 Sickboy
git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
167 18 Sickboy
</pre>(replace REPOSITORYNAME with the right repository, e.g test-mod.git)
168 1 Sickboy
169 1 Sickboy
170 1 Sickboy
h2. Info
171 1 Sickboy
172 42 Sickboy
* DevHeaven Git Discussion: http://dev-heaven.net/boards/1/topics/show/15
173 1 Sickboy
* Git: http://git-scm.com/
174 17 Sickboy
* Git <-> SVN Linked together: http://flavio.castelli.name/howto_use_git_with_svn
175 2 Sickboy
* Why Better: http://whygitisbetterthanx.com/
176 1 Sickboy
* GitFaq: http://git.or.cz/gitwiki/GitFaq
177 1 Sickboy
* GitHub: http://www.github.com
178 1 Sickboy
* Gitorious: http://gitorious.org/
179 1 Sickboy
* GitEnabled Pastebin: http://gist.github.com
180 1 Sickboy
* http://peepcode.com/products/git
181 1 Sickboy
* http://jfcouture.com/category/git/
182 43 Sickboy
* http://blog.carlmercier.com/2008/01/25/no-nonsense-git-part-1-git-remote-branch/
183 24 Sickboy
* http://github.com/webmat/git_remote_branch
184 24 Sickboy
185 24 Sickboy
h2. Experimental Clients
186 24 Sickboy
187 24 Sickboy
* "NetBeans Git Plugin":http://www.nbgit.org (This is only a wrapper, you still require a Git Implementation (MSYS/CygWin))
188 1 Sickboy
189 45 Sickboy
h1. Subversion (SVN)
190 1 Sickboy
191 1 Sickboy
* Please make sure your keyAgent (e.g Pageant) is running, and your private key is loaded
192 1 Sickboy
* DevHeaven Url: svn.dev-heaven.net
193 1 Sickboy
194 2 Sickboy
h1. Virtual Folders / Working with Repositories in ArmA
195 1 Sickboy
196 1 Sickboy
* Vista mklink: http://itsvista.com/2007/03/mklink/
197 1 Sickboy
* http://en.wikipedia.org/wiki/NTFS_junction_point
198 1 Sickboy
* http://schinagl.priv.at/nt/hardlinkshellext/hardlinkshellext.html