Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Last revision Both sides next revision | ||
git:sip-router-repository [2009/01/22 16:17] janakj |
git:sip-router-repository [2012/03/18 08:29] 109.230.216.60 voJxkfRbcK |
||
---|---|---|---|
Line 1: | Line 1: | ||
- | ====== Hacking SIP-ROUTER with Git ====== | + | Argh, brainfart, I smhoeow completely missed |
- | + | ||
- | + | ||
- | ====== SIP-ROUTER Git Repository ====== | + | |
- | The Git repository for **sip-router** is available through HTTP, SSH, | + | |
- | the proprietary Git protocol and CVS. The HTTP and Git access methods | + | |
- | provide only read-only access to the repository, | + | |
- | be able to check out your own copy of the repository, but you will not | + | |
- | be able to push your changes back. | + | |
- | + | ||
- | To clone the repository using Git protocol do (recommended for | + | |
- | read-only access): | + | |
- | < | + | |
- | git clone git:// | + | |
- | </ | + | |
- | + | ||
- | To clone the repository using HTTP do: | + | |
- | < | + | |
- | git clone http:// | + | |
- | </ | + | |
- | + | ||
- | If you have write access to the repository | + | |
- | then you can checkout the repository using ssh: | + | |
- | < | + | |
- | git clone ssh:// | + | |
- | </ | + | |
- | + | ||
- | where username is your username on host git.sip-router.org. Please see | + | |
- | also [[git:quick-start-guide|GIT Quick Start Guide]]. | + | |
- | + | ||
- | You can also browse the repository through the gitweb WWW interface at | + | |
- | http://git.sip-router.org | + | |
- | + | ||
- | ====== Repository Layout ====== | + | |
- | + | ||
- | The repository | + | |
- | branches: | + | |
- | * < | + | |
- | * tmp/* | + | |
- | * master | + | |
- | + | ||
- | In general you **should not** commit to master. You should use your | + | |
- | own branch for work-in-progress and only when you think it's in a good | + | |
- | enough form (it compiles and looks stable), you should merge it to | + | |
- | master. | + | |
- | + | ||
- | ====== Commit Messages ====== | + | |
- | + | ||
- | Please create the commit messages following the git convention: | + | |
- | * start with one short line, preferably less then 50 chars summarizing | + | |
- | * follow by exactly one empty line | + | |
- | * then a more detailed description (if necessary), but make sure you don't have lines longer then 72 characters | + | |
- | + | ||
- | See also: | + | |
- | * [[http:// | + | |
- | * [[http:// | + | |
- | + | ||
- | Example vim/gvim config additions for git commit messages: | + | |
- | < | + | |
- | " git commits edit | + | |
- | au BufNewFile, | + | |
- | au BufNewFile, | + | |
- | </ | + | |
- | + | ||
- | ====== Merge HOWTO ====== | + | |
- | + | ||
- | Please see [[git: | + | |
- | + | ||
- | ====== CVS Compatibility ====== | + | |
- | + | ||
- | The repository is also available through cvs for those who do not want | + | |
- | or cannot use git. A recent version of cvs client is needed to access | + | |
- | the repository. You need to have the following two environment | + | |
- | variable set if you want to access the repository anonymously through | + | |
- | the pserver method: | + | |
- | + | ||
- | < | + | |
- | export CVSROOT=: | + | |
- | export CVS_SERVER=git-cvsserver | + | |
- | </ | + | |
- | + | ||
- | To checkout the source tree you need to specify | + | |
- | **head** (a.k.a | + | |
- | branches are available in the repository in gitweb at | + | |
- | [[http:// | + | |
- | + | ||
- | The most important head names are: | + | |
- | * **master** - This is the main development/ | + | |
- | + | ||
- | So if you want to checkout the latest development version then do: | + | |
- | < | + | |
- | cvs co master | + | |
- | </ | + | |
- | + | ||
- | CVS write access is only available through ssh: | + | |
- | < | + | |
- | export CVSROOT=: | + | |
- | export CVS_SERVER=git-cvsserver | + | |
- | + | ||
- | cvs co master | + | |
- | </ | + | |
- | + | ||
- | The cvs compatibility layer does not support tagging and branching, so | + | |
- | you would need to use git for that. | + |