[webkit-dev] Branch Plan

2007-10-10 Thread Maciej Stachowiak


Hi Everyone,

Trunk has been closed to new feature development and risky changes in  
general for a long time. Most of the need to do heavy stabilization  
has passed. In the meantime, we have had feature-branch, which has  
recently been updated and brought much closer to trunk. It's time for  
trunk to reopen soon. If there are no objections, we'd like to execute  
the following sometime tomorrow:


1) Announce that trunk and feature-branch are temporarily closed to  
commits.


2) Create branches/safari-3-branch/ from trunk/. This is the branch  
that Apple will use for final stabilization of and updates to Safari  
3. We'd like to keep this branch Apple-managed, since we will have to  
comply with Apple-internal release engineering process. However, we  
welcome and encourage others to track this branch with their own  
stabilization branches, either in SVN or elsewhere. We may be able to  
merge in port-specific changes that do not affect the core code, but  
it's best not to assume such changes can go in.


3) Merge all patches one at a time from branches/feature-branch/ onto  
trunk/. We are doing this instead of just using an svn copy so that  
revisions on trunk remain in order, to allow tools like the nightlies  
and buildbots to maintain sanity and to make future history bisection  
searches to continue to work. At this point feature-branch/ will be  
obsolete and will be renamed to indicate this.


4) Announce that trunk is once again open for general development.

We will keep trunk nightlies and buildbots, and will add nightlies and  
buildbots for the stable branch as quickly as we can.


Note: if you are currently on feature-branch then you can follow the  
change transparently by using svn switch once trunk reopens.


If anyone has comments or objections, let me know. We will likely pull  
the trigger on this tomorrow afternoon (US Pacific time).


Regards,
Maciej


___
webkit-dev mailing list
webkit-dev@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev


Re: [webkit-dev] Branch Plan

2007-10-10 Thread Timothy Hatcher

Having branch in the name is redundant. I propose branches/safari-3.

On Oct 10, 2007, at 3:47 PM, Maciej Stachowiak wrote:


Create branches/safari-3-branch/ from trunk/.


— Timothy Hatcher


___
webkit-dev mailing list
webkit-dev@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev


Re: [webkit-dev] Branch Plan

2007-10-10 Thread Maciej Stachowiak


On Oct 10, 2007, at 3:51 PM, Timothy Hatcher wrote:


Having branch in the name is redundant. I propose branches/safari-3.


On the one hand, you're right that it's redundant. On the other hand, - 
having branch there makes it easier to talk about. We're more likely  
to say let's merge this change to the safari 3 branch than let's  
merge this change to branches slash safari 3. Similarly it would have  
been a bit weird for feature-branch to just be called branches/ 
feature. I'm not dead set on this but currentlly I like having -branch  
at the end a bit better.


 - Maciej



On Oct 10, 2007, at 3:47 PM, Maciej Stachowiak wrote:


Create branches/safari-3-branch/ from trunk/.


___
webkit-dev mailing list
webkit-dev@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev


Re: [webkit-dev] Branch Plan

2007-10-10 Thread Matt Lilek
On 10/10/07, Maciej Stachowiak [EMAIL PROTECTED] wrote:


  On Oct 10, 2007, at 3:51 PM, Timothy Hatcher wrote:

  Having branch in the name is redundant. I propose branches/safari-3.



 On the one hand, you're right that it's redundant. On the other hand,
 -having branch there makes it easier to talk about. We're more likely to say
 let's merge this change to the safari 3 branch than let's merge this
 change to branches slash safari 3. Similarly it would have been a bit weird
 for feature-branch to just be called branches/feature. I'm not dead set on
 this but currentlly I like having -branch at the end a bit better.


  - Maciej


  On Oct 10, 2007, at 3:47 PM, Maciej Stachowiak wrote:

 Create branches/safari-3-branch/ from trunk/.



Perhaps safari-3-branch could be named safari-3-apple and then have an
identical safari-3-public or safari-3-ports branch.  This way all the
branching would happen in one fell swoop and all the porters are on the same
page as to which branches are which and such.
Just my two cents.

- Matt
___
webkit-dev mailing list
webkit-dev@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev


Re: [webkit-dev] Branch Plan

2007-10-10 Thread Maciej Stachowiak


On Oct 10, 2007, at 4:46 PM, Timothy Hatcher wrote:

Might I suggest Safari-3-branch then? All of our other branches have  
a capital Safari.


Capital S sounds good to me.


On Oct 10, 2007, at 4:24 PM, Matt Lilek wrote:

Perhaps safari-3-branch could be named safari-3-apple and then  
have an identical safari-3-public or safari-3-ports branch.   
This way all the branching would happen in one fell swoop and all  
the porters are on the same page as to which branches are which and  
such.


Just my two cents.


Non-Apple branches probably shouldn't have Safari in the name. Maybe  
WebKit-3-stable would be a good name for a community-managed shared  
stable branch. If there was a shared such branch (as opposed to  
individual vendor branches) then we'd have to figure out what the  
checkin policy would be for such a branch.


Regards,
Maciej

___
webkit-dev mailing list
webkit-dev@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-dev