15 Jul
2009
15 Jul
'09
12:44 p.m.
On Wed, Jul 15, 2009 at 2:40 PM, Andrei
Pelinescu-Onciul<andrei(a)iptel.org> wrote:
On Jul 15, 2009 at 09:23, Edson - Lists
<4lists(a)gmail.com> wrote:
Actually we can merge from kamailio SVN repository easily too, but we
don't do it because there are no changes on the trunk (only on the 1.5
branch and Kamailio folks do all such changes also in git, afaik).
Jan.
I need some help to understand this...
Not the reported correction, but why are corrections/improvements still
being done with CVS, when all sip-router related
corrections/improvements should be done with git (as my understand)?
There are still people using ser 2.1 in production. For some it's very
difficult to switch to git (they have internal repositories tracking
the cvs and it will take some time to update them to use git).
In general if a bug affects ser too, we will fix it in ser (and for
there it will be propagated in sip-router). There are also some minor
improvements that will appear via ser.
Are this 'improvements' also available in the git repository? Or are
they specific to SER 'old version'??? But if so, why applied over
sip-router module?
They will be. We have semi-automatic merging with ser setup (meaning the
merge command is run "by hand", but the rest is automatic).
From time to time I merge changes in ser to sip-router. In general I
wait until we collect a few commits (because I'm lazy and I like having a
nicer history with fewer merges). Of course if there is a critical bug
I'll merge sooner.
This week ser changes will be in sip-router by the end of the week.
Note that we have this merging setup only with ser and not with kamailio
(because kamailio uses svn and while possible it would be
much more complicated to setup).