Module: sip-router Branch: master Commit: 17f3b62da975090cad2424fa55a5fa3b3c479481 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17f3b62d...
Author: Juha Heinanen jh@tutpro.com Committer: Juha Heinanen jh@tutpro.com Date: Sat Oct 10 10:58:40 2009 +0300
* utils/sercmd/sercmd.c: corrected include paths
- Include paths of ctl module still pointed to modules_s directory.
---
utils/sercmd/sercmd.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 9c9edf0..ada5ff6 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -59,9 +59,9 @@ #include "parse_listen_id.h" #include "license.h"
-#include "../../modules_s/ctl/ctl_defaults.h" /* default socket & port */ -#include "../../modules_s/ctl/binrpc.h" -#include "../../modules_s/ctl/binrpc.c" /* ugly hack */ +#include "../../modules/ctl/ctl_defaults.h" /* default socket & port */ +#include "../../modules/ctl/binrpc.h" +#include "../../modules/ctl/binrpc.c" /* ugly hack */
#ifndef NAME
Juha Heinanen writes:
utils/sercmd/sercmd.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
i have no idea if the commit went to correct (sr_3.0) branch. in svn, i have branches directory and when i make commit in the directory of a branch, it applies to that branch.
in my git cloned directory, i don't have any branch subdirectories and it is thus not obvious in which branch i am if any.
-- juha
On Oct 10, 2009 at 11:04, Juha Heinanen jh@tutpro.com wrote:
Juha Heinanen writes:
utils/sercmd/sercmd.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
i have no idea if the commit went to correct (sr_3.0) branch. in svn, i have branches directory and when i make commit in the directory of a branch, it applies to that branch.
No, it did not went, but there isn't any problem. Although I said we cannot merge master into sr_3.0, I meant in the future, from the point when they diverge (and I did expect some problems in the first few days). Probably we should announce a feature freeze on master for a few days.
in my git cloned directory, i don't have any branch subdirectories and it is thus not obvious in which branch i am if any.
git branch will tell you (the branch marked with a '*') or git symbolic-ref HEAD
If you want to push the branch you are on, you could use git push origin HEAD.
Note though that it's always better to specify the branch you push, e.g.: git push origin sr_3.0 (assuming you have a local sr_3.0 branch created with git checkout -b sr_3.0 origin/sr_3.0 or git branch sr_3.0 origin/sr_3.0).
You can also specify another local branch name, e.g. if your local branch tracking sr_3.0 is called my_sr_3.0, then you want to use git push origin my_sr_3.0:sr_3.0 .
By default (without config changes) git push or git push origin without any arguments will push _all_ the local matching branches (any local branch that has the same name as an origin branch).
You can always see what would happen by adding --dry-run to git push (e.g. git push --dry-run HEAD).
Andrei
-
Andrei Pelinescu-Onciul -
jh＠tutpro.com -
Juha Heinanen