[sip-comm-dev] branching for 1.0


#1

Hey folks,

I believe we are now ready to make our 1.0 branch on SVN. Of course,
there are still a number of open issues that prevent us from releasing
even an RC but the point of having that branch is to avoid blocking
those who are willing to contribute new features.

I pretty much like the highway analogy that Karl Fogel describes here:

http://producingoss.com/en/development-cycle.html

Besides there are also a number of features, (e.g., whiteboards, ssh,
bonjour etc..) that are not stable enough and that we would probably
like to omit in our first release. The branch would allow us to remove
them while still keeping them inside the trunk.

The 1.0 branch is going to remain open for commits for a substantial
amount of time since there are still a lot of bugs that need fixing. The
corresponding fixes would most certainly also need to get in trunk. I'll
try to setup a few scripts that will be propagating them to trunk so
that we won't have to do it manually as with the alpha2 branch.

In order for this whole thing to work smoothly we would need to agree that:

1) Bug fixes that apply to both branches would only be committed to 1.0
(and would then be automatically propagated to trunk)

2) New features and fixes that apply to exclusively to them would only
go to trunk.

Does this make sense to everyone? Anyone wants to raise warnings / share
thoughts on the matter before I proceed with the branch?

Cheers
Emil

···

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#2

I believe we are now ready to make our 1.0 branch on SVN. Of course,
there are still a number of open issues that prevent us from releasing
even an RC but the point of having that branch is to avoid blocking
those who are willing to contribute new features.

... and make the integration of the GSoC08 work.

Besides there are also a number of features, (e.g., whiteboards, ssh,
bonjour etc..) that are not stable enough and that we would probably
like to omit in our first release. The branch would allow us to remove
them while still keeping them inside the trunk.

By the way, has every plugin a maintainer?

The 1.0 branch is going to remain open for commits for a substantial
amount of time since there are still a lot of bugs that need fixing. The
corresponding fixes would most certainly also need to get in trunk. I'll
try to setup a few scripts that will be propagating them to trunk so
that we won't have to do it manually as with the alpha2 branch.

Use git-svn, Luke :wink:

In order for this whole thing to work smoothly we would need to agree that:

1) Bug fixes that apply to both branches would only be committed to 1.0
(and would then be automatically propagated to trunk)

2) New features and fixes that apply to exclusively to them would only
go to trunk.

Does this make sense to everyone? Anyone wants to raise warnings / share
thoughts on the matter before I proceed with the branch?

Seems fine to me.

···

Le 21 Jan 2009 à 18:46, Emil Ivov a écrit :

--
Sébastien Mazy

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#3

Folks,

It appears that we'll need to wait a little bit longer before we branch.
In order to have automated modification propagation between the 1.0
branch and trunk, we would need the merge tracking features that were
added to SVN in version 1.5.

Java.net is currently running CollabNet 4.5.2 which includes SVN 1.3.1:

http://help.collab.net/topic/releasenotes/cee/4_5_1.html

Luckily, Sun have previewed a java.net upgrade to CollabNet 5.2

https://5dot2stage-site-issues.dev.java.net/

which, among other things, also includes SVN 1.5

The upgrade is previewed for February 9th so that's when we'd be able to
spawn our branch.

Folks, that are waiting for new features to be committed/merged with
trunk, would therefore have to wait two more weeks (I sympathize!).

I'll do my best to make sure that all merging scripts are ready until
then so that we could branch as soon as Java.net has been upgraded.

Cheers
Emil

Emil Ivov wrote:

···

Hey folks,

I believe we are now ready to make our 1.0 branch on SVN. Of course,
there are still a number of open issues that prevent us from releasing
even an RC but the point of having that branch is to avoid blocking
those who are willing to contribute new features.

I pretty much like the highway analogy that Karl Fogel describes here:

http://producingoss.com/en/development-cycle.html

Besides there are also a number of features, (e.g., whiteboards, ssh,
bonjour etc..) that are not stable enough and that we would probably
like to omit in our first release. The branch would allow us to remove
them while still keeping them inside the trunk.

The 1.0 branch is going to remain open for commits for a substantial
amount of time since there are still a lot of bugs that need fixing. The
corresponding fixes would most certainly also need to get in trunk. I'll
try to setup a few scripts that will be propagating them to trunk so
that we won't have to do it manually as with the alpha2 branch.

In order for this whole thing to work smoothly we would need to agree that:

1) Bug fixes that apply to both branches would only be committed to 1.0
(and would then be automatically propagated to trunk)

2) New features and fixes that apply to exclusively to them would only
go to trunk.

Does this make sense to everyone? Anyone wants to raise warnings / share
thoughts on the matter before I proceed with the branch?

Cheers
Emil

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#4

A quick update here.

It appears that the java.net upgrade is now scheduled for the third week
in March. Since we need the upgrade in order to use the subversion 1.5
merge tracking functionalities, we will not be doing the branch before
that date.

Sorry folks. I guess we'd need to be patient for another month.

Cheers
Emil

Emil Ivov wrote:

···

Folks,

It appears that we'll need to wait a little bit longer before we branch.
In order to have automated modification propagation between the 1.0
branch and trunk, we would need the merge tracking features that were
added to SVN in version 1.5.

Java.net is currently running CollabNet 4.5.2 which includes SVN 1.3.1:

http://help.collab.net/topic/releasenotes/cee/4_5_1.html

Luckily, Sun have previewed a java.net upgrade to CollabNet 5.2

https://5dot2stage-site-issues.dev.java.net/

which, among other things, also includes SVN 1.5

The upgrade is previewed for February 9th so that's when we'd be able to
spawn our branch.

Folks, that are waiting for new features to be committed/merged with
trunk, would therefore have to wait two more weeks (I sympathize!).

I'll do my best to make sure that all merging scripts are ready until
then so that we could branch as soon as Java.net has been upgraded.

Cheers
Emil

Emil Ivov wrote:

Hey folks,

I believe we are now ready to make our 1.0 branch on SVN. Of course,
there are still a number of open issues that prevent us from releasing
even an RC but the point of having that branch is to avoid blocking
those who are willing to contribute new features.

I pretty much like the highway analogy that Karl Fogel describes here:

http://producingoss.com/en/development-cycle.html

Besides there are also a number of features, (e.g., whiteboards, ssh,
bonjour etc..) that are not stable enough and that we would probably
like to omit in our first release. The branch would allow us to remove
them while still keeping them inside the trunk.

The 1.0 branch is going to remain open for commits for a substantial
amount of time since there are still a lot of bugs that need fixing. The
corresponding fixes would most certainly also need to get in trunk. I'll
try to setup a few scripts that will be propagating them to trunk so
that we won't have to do it manually as with the alpha2 branch.

In order for this whole thing to work smoothly we would need to agree that:

1) Bug fixes that apply to both branches would only be committed to 1.0
(and would then be automatically propagated to trunk)

2) New features and fixes that apply to exclusively to them would only
go to trunk.

Does this make sense to everyone? Anyone wants to raise warnings / share
thoughts on the matter before I proceed with the branch?

Cheers
Emil

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net