Revision: 5935 http://openser.svn.sourceforge.net/openser/?rev=5935&view=rev Author: oej Date: 2009-10-08 10:11:33 +0000 (Thu, 08 Oct 2009)
Log Message: ----------- Fix some typos and formatting
Modified Paths: -------------- trunk/etc/kamailio.cfg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Hi Olle!
Why do you edit the Kamailio trunk on sourceforge? sourceforge repository is only used for patching older releases (1.3,1.4 and 1.5 branches).
trunk is not used anymore, trunk-development happens on sip-router git repository.
regards klaus
Olle E. Johansson schrieb:
Revision: 5935 http://openser.svn.sourceforge.net/openser/?rev=5935&view=rev Author: oej Date: 2009-10-08 10:11:33 +0000 (Thu, 08 Oct 2009)
Log Message:
Fix some typos and formatting
Modified Paths:
trunk/etc/kamailio.cfgThis was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
8 okt 2009 kl. 13.37 skrev Klaus Darilion:
Hi Olle!
Why do you edit the Kamailio trunk on sourceforge? sourceforge repository is only used for patching older releases (1.3,1.4 and 1.5 branches).
trunk is not used anymore, trunk-development happens on sip-router git repository.
Just to test that I had access... :-)
Now trying to get git access up and running too.
/O
Olle E. Johansson schrieb:
8 okt 2009 kl. 13.37 skrev Klaus Darilion:
Hi Olle!
Why do you edit the Kamailio trunk on sourceforge? sourceforge repository is only used for patching older releases (1.3,1.4 and 1.5 branches).
trunk is not used anymore, trunk-development happens on sip-router git repository.
Just to test that I had access... :-)
Now trying to get git access up and running too.
Have fun! ;-)
8 okt 2009 kl. 14.36 skrev Klaus Darilion:
Olle E. Johansson schrieb:
8 okt 2009 kl. 13.37 skrev Klaus Darilion:
Hi Olle!
Why do you edit the Kamailio trunk on sourceforge? sourceforge repository is only used for patching older releases (1.3,1.4 and 1.5 branches).
trunk is not used anymore, trunk-development happens on sip-router git repository.
Just to test that I had access... :-) Now trying to get git access up and running too.
Have fun! ;-)
Already have... Had some changes to Makefile (to include ldap module) and did not want to commit that. Ended up removing it and now git says it's deleted... How on earth do I properly revert a change?
/O
On Thu, Oct 8, 2009 at 2:45 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.36 skrev Klaus Darilion:
Olle E. Johansson schrieb:
8 okt 2009 kl. 13.37 skrev Klaus Darilion:
Hi Olle!
Why do you edit the Kamailio trunk on sourceforge? sourceforge repository is only used for patching older releases (1.3,1.4 and 1.5 branches).
trunk is not used anymore, trunk-development happens on sip-router git repository.
Just to test that I had access... :-) Now trying to get git access up and running too.
Have fun! ;-)
Already have... Had some changes to Makefile (to include ldap module) and did not want to commit that. Ended up removing it and now git says it's deleted... How on earth do I properly revert a change?
git checkout <file>
Jan.
8 okt 2009 kl. 14.58 skrev Jan Janak:
On Thu, Oct 8, 2009 at 2:45 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.36 skrev Klaus Darilion:
Olle E. Johansson schrieb:
8 okt 2009 kl. 13.37 skrev Klaus Darilion:
Hi Olle!
Why do you edit the Kamailio trunk on sourceforge? sourceforge repository is only used for patching older releases (1.3,1.4 and 1.5 branches).
trunk is not used anymore, trunk-development happens on sip- router git repository.
Just to test that I had access... :-) Now trying to get git access up and running too.
Have fun! ;-)
Already have... Had some changes to Makefile (to include ldap module) and did not want to commit that. Ended up removing it and now git says it's deleted... How on earth do I properly revert a change?
git checkout <file>
Great. The mystery continues:
1x-193-157-197-57:sip-router.2 olle$ git push To ssh://oej@git.sip-router.org/sip-router ! [rejected] master -> master (non-fast forward) error: failed to push some refs to 'ssh://oej@git.sip-router.org/sip- router'
Maybe Daniel hasn't added my ssh key...
/O
On Thu, Oct 8, 2009 at 3:12 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.58 skrev Jan Janak:
On Thu, Oct 8, 2009 at 2:45 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.36 skrev Klaus Darilion:
Olle E. Johansson schrieb:
8 okt 2009 kl. 13.37 skrev Klaus Darilion:
Hi Olle!
Why do you edit the Kamailio trunk on sourceforge? sourceforge repository is only used for patching older releases (1.3,1.4 and 1.5 branches).
trunk is not used anymore, trunk-development happens on sip-router git repository.
Just to test that I had access... :-) Now trying to get git access up and running too.
Have fun! ;-)
Already have... Had some changes to Makefile (to include ldap module) and did not want to commit that. Ended up removing it and now git says it's deleted... How on earth do I properly revert a change?
git checkout <file>
Great. The mystery continues:
1x-193-157-197-57:sip-router.2 olle$ git push To ssh://oej@git.sip-router.org/sip-router ! [rejected] master -> master (non-fast forward) error: failed to push some refs to 'ssh://oej@git.sip-router.org/sip-router'
This error means that your local repository is not up-to-date, in other words you have modified an older version and git wants you to pull the latest changes, resolve conflicts (if any) and then push again.
Run git pull and then try again.
Jan.
8 okt 2009 kl. 15.17 skrev Jan Janak:
On Thu, Oct 8, 2009 at 3:12 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.58 skrev Jan Janak:
On Thu, Oct 8, 2009 at 2:45 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.36 skrev Klaus Darilion:
Olle E. Johansson schrieb:
8 okt 2009 kl. 13.37 skrev Klaus Darilion: > > Hi Olle! > > Why do you edit the Kamailio trunk on sourceforge? > sourceforge repository is only used for patching older releases > (1.3,1.4 > and 1.5 branches). > > trunk is not used anymore, trunk-development happens on sip- > router git > repository. > Just to test that I had access... :-) Now trying to get git access up and running too.
Have fun! ;-)
Already have... Had some changes to Makefile (to include ldap module) and did not want to commit that. Ended up removing it and now git says it's deleted... How on earth do I properly revert a change?
git checkout <file>
Great. The mystery continues:
1x-193-157-197-57:sip-router.2 olle$ git push To ssh://oej@git.sip-router.org/sip-router ! [rejected] master -> master (non-fast forward) error: failed to push some refs to 'ssh://oej@git.sip-router.org/ sip-router'
This error means that your local repository is not up-to-date, in other words you have modified an older version and git wants you to pull the latest changes, resolve conflicts (if any) and then push again.
Run git pull and then try again.
Thanks for all you patience! It seems to work now.
Be prepared to revert stupid commits ;-)
/O
On Thu, Oct 8, 2009 at 3:29 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 15.17 skrev Jan Janak:
On Thu, Oct 8, 2009 at 3:12 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.58 skrev Jan Janak:
On Thu, Oct 8, 2009 at 2:45 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.36 skrev Klaus Darilion:
Olle E. Johansson schrieb: > > 8 okt 2009 kl. 13.37 skrev Klaus Darilion: >> >> Hi Olle! >> >> Why do you edit the Kamailio trunk on sourceforge? >> sourceforge repository is only used for patching older releases >> (1.3,1.4 >> and 1.5 branches). >> >> trunk is not used anymore, trunk-development happens on sip-router >> git >> repository. >> > Just to test that I had access... :-) > Now trying to get git access up and running too.
Have fun! ;-)
Already have... Had some changes to Makefile (to include ldap module) and did not want to commit that. Ended up removing it and now git says it's deleted... How on earth do I properly revert a change?
git checkout <file>
Great. The mystery continues:
1x-193-157-197-57:sip-router.2 olle$ git push To ssh://oej@git.sip-router.org/sip-router ! [rejected] master -> master (non-fast forward) error: failed to push some refs to 'ssh://oej@git.sip-router.org/sip-router'
This error means that your local repository is not up-to-date, in other words you have modified an older version and git wants you to pull the latest changes, resolve conflicts (if any) and then push again.
Run git pull and then try again.
Thanks for all you patience! It seems to work now.
Be prepared to revert stupid commits ;-)
Reverting commits is unfortunately not easily doable, so better be careful :-).
If you have bigger changes or if you are unsure then it is better to put them on a separate branch and then push that branch into the shared repository where we can review it and then merge it into the master branch.
If you have your changes on a branch called "my_branch" then you can push it into the shared repository with: git push origin my_branch:oej/my_branch
"oej/my_branch" is the desired name of the newly created branch in the shared repository at git.sip-router.org. Note that it should start with your username followed by slash (oej/), because the shared repository is configured to accept private branches only if they start with the committer's username.
Jan.
8 okt 2009 kl. 16.03 skrev Jan Janak:
On Thu, Oct 8, 2009 at 3:29 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 15.17 skrev Jan Janak:
On Thu, Oct 8, 2009 at 3:12 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.58 skrev Jan Janak:
On Thu, Oct 8, 2009 at 2:45 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.36 skrev Klaus Darilion:
> > > Olle E. Johansson schrieb: >> >> 8 okt 2009 kl. 13.37 skrev Klaus Darilion: >>> >>> Hi Olle! >>> >>> Why do you edit the Kamailio trunk on sourceforge? >>> sourceforge repository is only used for patching older >>> releases >>> (1.3,1.4 >>> and 1.5 branches). >>> >>> trunk is not used anymore, trunk-development happens on sip- >>> router >>> git >>> repository. >>> >> Just to test that I had access... :-) >> Now trying to get git access up and running too. > > Have fun! ;-)
Already have... Had some changes to Makefile (to include ldap module) and did not want to commit that. Ended up removing it and now git says it's deleted... How on earth do I properly revert a change?
git checkout <file>
Great. The mystery continues:
1x-193-157-197-57:sip-router.2 olle$ git push To ssh://oej@git.sip-router.org/sip-router ! [rejected] master -> master (non-fast forward) error: failed to push some refs to 'ssh://oej@git.sip-router.org/sip-router'
This error means that your local repository is not up-to-date, in other words you have modified an older version and git wants you to pull the latest changes, resolve conflicts (if any) and then push again.
Run git pull and then try again.
Thanks for all you patience! It seems to work now.
Be prepared to revert stupid commits ;-)
Reverting commits is unfortunately not easily doable, so better be careful :-).
Well, if you want to revert then it is YOUR problem... Ha ha.
If you have bigger changes or if you are unsure then it is better to put them on a separate branch and then push that branch into the shared repository where we can review it and then merge it into the master branch.
That's what we do in <the-other-project>. I am well known to have too many branches...
If you have your changes on a branch called "my_branch" then you can push it into the shared repository with: git push origin my_branch:oej/my_branch
"oej/my_branch" is the desired name of the newly created branch in the shared repository at git.sip-router.org. Note that it should start with your username followed by slash (oej/), because the shared repository is configured to accept private branches only if they start with the committer's username.
Great. Thanks.
To start with, you'll propably see a series of minor fixes to docs and stuff like that.
/O
On Thu, Oct 8, 2009 at 4:11 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 16.03 skrev Jan Janak:
On Thu, Oct 8, 2009 at 3:29 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 15.17 skrev Jan Janak:
On Thu, Oct 8, 2009 at 3:12 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.58 skrev Jan Janak:
On Thu, Oct 8, 2009 at 2:45 PM, Olle E. Johansson oej@edvina.net wrote: > > 8 okt 2009 kl. 14.36 skrev Klaus Darilion: > >> >> >> Olle E. Johansson schrieb: >>> >>> 8 okt 2009 kl. 13.37 skrev Klaus Darilion: >>>> >>>> Hi Olle! >>>> >>>> Why do you edit the Kamailio trunk on sourceforge? >>>> sourceforge repository is only used for patching older releases >>>> (1.3,1.4 >>>> and 1.5 branches). >>>> >>>> trunk is not used anymore, trunk-development happens on sip-router >>>> git >>>> repository. >>>> >>> Just to test that I had access... :-) >>> Now trying to get git access up and running too. >> >> Have fun! ;-) > > Already have... Had some changes to Makefile (to include ldap module) > and > did not want to commit that. Ended up removing it and now git says > it's > deleted... How on earth do I properly revert a change?
git checkout <file>
Great. The mystery continues:
1x-193-157-197-57:sip-router.2 olle$ git push To ssh://oej@git.sip-router.org/sip-router ! [rejected] master -> master (non-fast forward) error: failed to push some refs to 'ssh://oej@git.sip-router.org/sip-router'
This error means that your local repository is not up-to-date, in other words you have modified an older version and git wants you to pull the latest changes, resolve conflicts (if any) and then push again.
Run git pull and then try again.
Thanks for all you patience! It seems to work now.
Be prepared to revert stupid commits ;-)
Reverting commits is unfortunately not easily doable, so better be careful :-).
Well, if you want to revert then it is YOUR problem... Ha ha.
If you have bigger changes or if you are unsure then it is better to put them on a separate branch and then push that branch into the shared repository where we can review it and then merge it into the master branch.
That's what we do in <the-other-project>. I am well known to have too many branches...
If you have your changes on a branch called "my_branch" then you can push it into the shared repository with: git push origin my_branch:oej/my_branch
"oej/my_branch" is the desired name of the newly created branch in the shared repository at git.sip-router.org. Note that it should start with your username followed by slash (oej/), because the shared repository is configured to accept private branches only if they start with the committer's username.
Great. Thanks.
To start with, you'll propably see a series of minor fixes to docs and stuff like that.
Yeah, that would be great, this kind of stuff can go directly to master branch.
Jan.
On Oct 08, 2009 at 15:17, Jan Janak jan@ryngle.com wrote:
On Thu, Oct 8, 2009 at 3:12 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.58 skrev Jan Janak:
On Thu, Oct 8, 2009 at 2:45 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.36 skrev Klaus Darilion:
Olle E. Johansson schrieb:
8 okt 2009 kl. 13.37 skrev Klaus Darilion: > > Hi Olle! > > Why do you edit the Kamailio trunk on sourceforge? > sourceforge repository is only used for patching older releases > (1.3,1.4 > and 1.5 branches). > > trunk is not used anymore, trunk-development happens on sip-router git > repository. > Just to test that I had access... :-) Now trying to get git access up and running too.
Have fun! ;-)
Already have... Had some changes to Makefile (to include ldap module) and did not want to commit that. Ended up removing it and now git says it's deleted... How on earth do I properly revert a change?
git checkout <file>
Great. The mystery continues:
1x-193-157-197-57:sip-router.2 olle$ git push To ssh://oej@git.sip-router.org/sip-router ??! [rejected] ?? ?? ?? ??master -> master (non-fast forward) error: failed to push some refs to 'ssh://oej@git.sip-router.org/sip-router'
This error means that your local repository is not up-to-date, in other words you have modified an older version and git wants you to pull the latest changes, resolve conflicts (if any) and then push again.
Run git pull and then try again.
No, you shouldn't run simple git pull, it will generate a useless merge commit. Use instead: git fetch origin; git pull --rebase --ff origin master
See http://sip-router.org/wiki/git/commit-into-master. You should also look at: http://sip-router.org/wiki/git/sip-router-repository and http://sip-router.org/wiki/devel/git-commit-guidelines
Andrei
On Oct 08, 2009 at 16:07, Andrei Pelinescu-Onciul andrei@iptel.org wrote:
On Oct 08, 2009 at 15:17, Jan Janak jan@ryngle.com wrote:
On Thu, Oct 8, 2009 at 3:12 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.58 skrev Jan Janak:
On Thu, Oct 8, 2009 at 2:45 PM, Olle E. Johansson oej@edvina.net wrote:
8 okt 2009 kl. 14.36 skrev Klaus Darilion:
Olle E. Johansson schrieb: > > 8 okt 2009 kl. 13.37 skrev Klaus Darilion: >> >> Hi Olle! >> >> Why do you edit the Kamailio trunk on sourceforge? >> sourceforge repository is only used for patching older releases >> (1.3,1.4 >> and 1.5 branches). >> >> trunk is not used anymore, trunk-development happens on sip-router git >> repository. >> > Just to test that I had access... :-) > Now trying to get git access up and running too.
Have fun! ;-)
Already have... Had some changes to Makefile (to include ldap module) and did not want to commit that. Ended up removing it and now git says it's deleted... How on earth do I properly revert a change?
git checkout <file>
Great. The mystery continues:
1x-193-157-197-57:sip-router.2 olle$ git push To ssh://oej@git.sip-router.org/sip-router ??! [rejected] ?? ?? ?? ??master -> master (non-fast forward) error: failed to push some refs to 'ssh://oej@git.sip-router.org/sip-router'
This error means that your local repository is not up-to-date, in other words you have modified an older version and git wants you to pull the latest changes, resolve conflicts (if any) and then push again.
Run git pull and then try again.
No, you shouldn't run simple git pull, it will generate a useless merge commit. Use instead: git fetch origin; git pull --rebase --ff origin master
See http://sip-router.org/wiki/git/commit-into-master. You should also look at: http://sip-router.org/wiki/git/sip-router-repository and http://sip-router.org/wiki/devel/git-commit-guidelines
Also until you get some experience with git, try using:
git fetch origin git log origin/master..HEAD
to see what would be pushed, before doing the actual push.
You could also add --graph --color to git log for a nicer output, or you could use git whatchanged instead.
Only if it looks ok, go ahead with the push. If it doesn't paste the output and email it and someone will tell you what to do or what you did wrong (but if you do as described on the wiki, you shouldn't have any problems).
Andrei
-
Andrei Pelinescu-Onciul -
Jan Janak -
jh＠tutpro.com -
Klaus Darilion -
Olle E. Johansson