Due to the upcoming release, there will be no regular pull walk-through tomorrow. Thanks for the growing rate of contribution, and let's resume the ritual next Sunday.

Andrei

On 2012-07-29 08:08, Andrei Alexandrescu wrote:
> Due to the upcoming release, there will be no regular pull walk-through
> tomorrow. Thanks for the growing rate of contribution, and let's resume
> the ritual next Sunday.
>
> Andrei

Again, we _need_ to start using branches.

-- 
/Jacob Carlborg

On 29-07-2012 13:11, Jacob Carlborg wrote:
> On 2012-07-29 08:08, Andrei Alexandrescu wrote:
>> Due to the upcoming release, there will be no regular pull walk-through
>> tomorrow. Thanks for the growing rate of contribution, and let's resume
>> the ritual next Sunday.
>>
>> Andrei
>
> Again, we _need_ to start using branches.
>

Amen.

There is no reason master should be frozen due to a release being made.

The way we do releases is completely backwards: We freeze master, do the release, and *then* make a tag in Git. It should be the other way around, but replace tag with branch.

The current release model may have seemed like a good idea during SVN times, but we're using Git now.

-- 
Alex Rønne Petersen
alex@lycus.org
http://lycus.org

On 29-Jul-12 15:11, Jacob Carlborg wrote:
> On 2012-07-29 08:08, Andrei Alexandrescu wrote:
>> Due to the upcoming release, there will be no regular pull walk-through
>> tomorrow. Thanks for the growing rate of contribution, and let's resume
>> the ritual next Sunday.
>>
>> Andrei
>
> Again, we _need_ to start using branches.
>

+1

-- 
Dmitry Olshansky

On Sun, 2012-07-29 at 13:11 +0200, Jacob Carlborg wrote:
> On 2012-07-29 08:08, Andrei Alexandrescu wrote:
> > Due to the upcoming release, there will be no regular pull walk-through tomorrow. Thanks for the growing rate of contribution, and let's resume the ritual next Sunday.
> >
> > Andrei
> 
> Again, we _need_ to start using branches.

Although not personally involved, I do get the feeling that CVCS workflow is being used with a DVCS system. Possible since CVCS < DVCS.

Keeping feature branches off the mainline is also a good move – having feature branches on the mainline is a return to CVCS thinking.  Having the mainline as a pristine representation of the official state of the project (possibly with maintenance branches) is the best idea, everything else can be done by people sharing and creating pull requests when done.

-- 
Russel. ============================================================================= Dr Russel Winder      t: +44 20 7585 2200   voip: sip:russel.winder@ekiga.net 41 Buckmaster Road    m: +44 7770 465 077   xmpp: russel@winder.org.uk London SW11 1EN, UK   w: www.russel.org.uk  skype: russel_winder

On Sunday, 29 July 2012 at 06:08:18 UTC, Andrei Alexandrescu wrote:
> Due to the upcoming release, there will be no regular pull walk-through tomorrow. Thanks for the growing rate of contribution, and let's resume the ritual next Sunday.
>
> Andrei

I really can't shake the feeling that you guys just don't get git!

You never need to freeze pulls with git. Ever! It just slows down development.

The work flow is simple enough:

1. Time for a release
2. Create a release branch, it is feature frozen
3. You can keep pulling feature into master, no problem
4. You can pull regression/bug fixes into the release branch
5. A release is made, merge the release branch into master and continue.

I don't know why I bothered typing this out - the discussion has been had time and time again with no progress made.

On Sunday, 29 July 2012 at 11:43:41 UTC, Robert Clipsham wrote:
> 4. You can pull regression/bug fixes into the release branch

Just to clarify: »Pulling« in this context means cherry-picking individual bug fixes critical for the release from the main branch. Virtually all changes and pull requests still go on the main branch first, and are then »backported« onto the release branch.

And by the way, you don't even need a DVCS for that. Many SVN-based open source projects use a »branch-before-release« workflow as well.

David

On 7/29/12 7:43 AM, Robert Clipsham wrote:
> On Sunday, 29 July 2012 at 06:08:18 UTC, Andrei Alexandrescu wrote:
>> Due to the upcoming release, there will be no regular pull
>> walk-through tomorrow. Thanks for the growing rate of contribution,
>> and let's resume the ritual next Sunday.
>>
>> Andrei
>
> I really can't shake the feeling that you guys just don't get git!
>
> You never need to freeze pulls with git. Ever! It just slows down
> development.
>
> The work flow is simple enough:
>
> 1. Time for a release
> 2. Create a release branch, it is feature frozen
> 3. You can keep pulling feature into master, no problem
> 4. You can pull regression/bug fixes into the release branch
> 5. A release is made, merge the release branch into master and continue.
>
> I don't know why I bothered typing this out - the discussion has been
> had time and time again with no progress made.

I'm all for it. We're just too busy most of the time to stop and improve our process. I think it's a good opportunity to do so right after 2.060.


Thanks,

Andrei

Am Sun, 29 Jul 2012 13:11:08 +0200
schrieb Jacob Carlborg <doob@me.com>:

> On 2012-07-29 08:08, Andrei Alexandrescu wrote:
> > Due to the upcoming release, there will be no regular pull walk-through tomorrow. Thanks for the growing rate of contribution, and let's resume the ritual next Sunday.
> >
> > Andrei
> 
> Again, we _need_ to start using branches.

Ego cogito, ceterum censeo Carthaginem delendam esse!

-- 
Marco

On 2012-07-29 16:28, Andrei Alexandrescu wrote:

> I'm all for it. We're just too busy most of the time to stop and improve
> our process. I think it's a good opportunity to do so right after 2.060.

It should have happened a long time ago.

-- 
/Jacob Carlborg