Hello,
On 1/7/10 2:31 PM, Klaus Darilion wrote:
Hi!
I just did a bugfix in kamailio branch. Now I want this fixes also to be in sr_3.0 branch and master branch.
What is the preferred way to do this?
E.g.:
- Merge from origin->kamailio_3.0 into origin->sr_3.0?
- Merge from my local->kamailio_3.0 into my local->sr_3.0 and then
push from local->sr_3.0 into origin->sr_3.0?
- Or should I cherrypick the patches to sr_3.0 and to master?
I use cherry-pick to avoid merging unwanted stuff.
Cheers, Daniel
btw: I'm not even sure if "merge" is correct in here - does "merge" merges all changes or can I choose which commits to merge?
regards Klaus
Klaus Darilion schrieb:
Module: sip-router Branch: kamailio_3.0 Commit: 8929913f5edb519b7ed280a12728376ed872ec53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8929913f...
Author: Klaus Darilion klaus.mailinglists@pernau.at Committer: Klaus Darilion klaus.mailinglists@pernau.at Date: Wed Dec 30 15:53:12 2009 +0000
- fix bug in encode_contact()
- fix and extend documentation about contact encoding/decoding
modules_k/siputils/README | 392 ++++++++++++++++------------- modules_k/siputils/contact_ops.c | 5 +- modules_k/siputils/doc/siputils_admin.xml | 42 ++-- 3 files changed, 252 insertions(+), 187 deletions(-)
Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8929...
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev