Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
git:sip-router-repository [2009/04/16 14:13] andrei |
git:sip-router-repository [2012/12/11 16:53] (current) oej old revision restored |
||
|---|---|---|---|
| Line 25: | Line 25: | ||
| git clone ssh:// | git clone ssh:// | ||
| </ | </ | ||
| - | |||
| where username is your username on host git.sip-router.org. Please see | where username is your username on host git.sip-router.org. Please see | ||
| - | also [[git: | + | also [[git: |
| + | changes. | ||
| + | |||
| + | After " | ||
| + | Right now there are 3 important branches in the repository: | ||
| + | - **master** - latest code, all the new development goes here. | ||
| + | - **sr_3.0** - branch for the future sip-router 3.0 release, in process of being stabilized. | ||
| + | - **kamailio_3.0** - branch for the kamailio 3.0 release (kamailio 3.0 is the first kamailio release that will be based on sip-router, in this case the sr_3.0 branch). | ||
| + | |||
| + | If you are interested in a different branch then **master**, you have to use git checkout to change the branch, e.g.: | ||
| + | < | ||
| + | cd sip-router | ||
| + | git checkout --track -b sr_3.0 origin/ | ||
| + | </ | ||
| + | (replace **sr_3.0** with the desired branch). | ||
| + | The above command will create a local **sr_3.0** branch that will track changes in the remote (repository) | ||
| + | | ||
| + | Note that as an alternative, | ||
| + | < | ||
| + | git clone --branch sr_3.0 git:// | ||
| + | cd sip-router | ||
| + | </ | ||
| + | |||
| + | You need to do all of the above only once. After you already have a " | ||
| + | < | ||
| + | git fetch origin | ||
| + | git pull --rebase origin sr_3.0 | ||
| + | </ | ||
| + | (replace **sr_3.0** with the branch you are on). | ||
| You can also browse the repository through the gitweb WWW interface at | You can also browse the repository through the gitweb WWW interface at | ||
| - | http:// | + | http:// |
| + | If you prefer you could use cvs instead of git (see below), but it will be significantly slower. | ||
| ====== Repository Layout ====== | ====== Repository Layout ====== | ||
| Line 52: | Line 81: | ||
| * then a more detailed description (if necessary), but make sure you don't have lines longer then 72 characters | * then a more detailed description (if necessary), but make sure you don't have lines longer then 72 characters | ||
| - | See: [[devel: | + | Make sure you read [[devel: |
| - | See also: | + | |
| - | * [[http:// | + | |
| - | * [[http:// | + | |
| Example vim/gvim config additions for git commit messages: | Example vim/gvim config additions for git commit messages: | ||
| Line 63: | Line 90: | ||
| au BufNewFile, | au BufNewFile, | ||
| </ | </ | ||
| + | |||
| + | ====== Commit/push HOWTO ====== | ||
| + | |||
| + | Please see [[git: | ||
| ====== Merge HOWTO ====== | ====== Merge HOWTO ====== | ||
| Line 88: | Line 119: | ||
| The most important head names are: | The most important head names are: | ||
| * **master** - This is the main development/ | * **master** - This is the main development/ | ||
| + | * **sr_3.0** - This is the (soon to be) stable sip-router 3.0 branch. | ||
| + | * **kamailio_3.0** - This is the kamailio 3.0 stable branch (based on **sr_3.0**). | ||
| So if you want to checkout the latest development version then do: | So if you want to checkout the latest development version then do: | ||
