Damian Krzeminski wrote:
> Mircea Carasel agreed to be a sipXconfig coordinator for a stable (4.0.x)
> branch. This is similar to what Paul and Huijun did for 3.10 at one point.
> 
> Please do not commit anything to sipXconfig directory on 4.0 unless you
> have his blessing.
> 
> Everybody tends to do that a bit differently so I am not going to spell all
> the details but Mircea will have an important voice in deciding which new
> issues should be fixed in 4.0 and which can be fixed in 4.1 branch. He can
> add any issue he deems relevant to 4.0.x releases. By the same token if he
> thinks that something is too risky for 4.0 it's going to be hard to
> convince me otherwise :-)
> 
> The 4.0 is very new, many people will try it for the first time and we may
> end up having a lot of issues opened in the coming 2-3 weeks. I am going to
> do my best to help Mircea and I'd like to ask other sipXconfig contributors
> to so the same.
> 

One more clarification:
I am still regularly (more or less weekly) - merging all 4.0 commits that
touched sipXconfig directory to mainline. Neither Mircea nor patch author
have to worry about it. I'll find you if I have questions. Only if you do
*not* want something in main I appreciate heads up.

By the same token if you want something merged in a reverse direction
(mainline to 4.0) you should make sure that Mircea is OK with that.

Again: this is pretty much the same policy that we had with other releases.
It's just that we all managed to forget with last release being nearly a
year ago :-)
D.

PS: FAQs

Q. How do know if my commit touched sipXconfig directory?

A.
cd /path/to/my/workspace
git shortlog -- sipXconfig # git users do this
git whatchanged -- sipXconfig  # or this


svn log sipXconfig  # subversion users do this - and wait ;-)

Q. I love merging. Can I merge myself?

A.
Sure you can. Just make sure that in whatever way you choose to do it
svnmerge properties reflect what really happened. And please remember that
merge commit is like any other commit. Better make sure that
project/component coordinator will not be surprised (check JIRA for
component owners).




_______________________________________________
sipx-dev mailing list
[email protected]
List Archive: http://list.sipfoundry.org/archive/sipx-dev
Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev

Reply via email to