Status of kha/experimental

Status of kha/experimental

[Catalin Marinas]

Hi Karl,

How stable is the kha/experimental branch? Since there are more and
more bugs added to the tracking system, I'll have to start looking at
them before a 0.14 release. Is it worth merging the kha/experimental
now or we better wait for after 0.14?

Thanks.

-- 
Catalin

Re: Status of kha/experimental

[Karl Hasselström]

On 2007-10-07 22:18:44 +0100, Catalin Marinas wrote:

> How stable is the kha/experimental branch? Since there are more and
> more bugs added to the tracking system, I'll have to start looking
> at them before a 0.14 release. Is it worth merging the
> kha/experimental now or we better wait for after 0.14?

The idea is that experimental contains changes that need testing, but
may not yet be ready for your master. (They are generally safe,
though; I run StGit from my experimental branch at work, for example.)
When I decide that they are ready, I move them to safe. If there are
any patches you feel should be in safe rather than experimental, just
ask. Or you could just take them directly from experimental without
asking, of course. :-)

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: Status of kha/experimental

[Catalin Marinas]

On 07/10/2007, Karl Hasselström <kha@treskal.com> wrote:
> On 2007-10-07 22:18:44 +0100, Catalin Marinas wrote:
>
> > How stable is the kha/experimental branch? Since there are more and
> > more bugs added to the tracking system, I'll have to start looking
> > at them before a 0.14 release. Is it worth merging the
> > kha/experimental now or we better wait for after 0.14?
>
> The idea is that experimental contains changes that need testing, but
> may not yet be ready for your master. (They are generally safe,
> though; I run StGit from my experimental branch at work, for example.)
> When I decide that they are ready, I move them to safe. If there are
> any patches you feel should be in safe rather than experimental, just
> ask. Or you could just take them directly from experimental without
> asking, of course. :-)

OK. My plan is to merge kha/safe and have a look at what seems safer
to merge from kha/experimental. Fix bugs (and freeze the current
features). Release 0.14. Merge kha/experimental entirely post 0.14 and
test/stabilize it over couple of months. How does this sound?

-- 
Catalin

Re: Status of kha/experimental

[Yann Dirson]

On Tue, Oct 09, 2007 at 10:10:12PM +0100, Catalin Marinas wrote:
> On 07/10/2007, Karl Hasselström <kha@treskal.com> wrote:
> > On 2007-10-07 22:18:44 +0100, Catalin Marinas wrote:
> >
> > > How stable is the kha/experimental branch? Since there are more and
> > > more bugs added to the tracking system, I'll have to start looking
> > > at them before a 0.14 release. Is it worth merging the
> > > kha/experimental now or we better wait for after 0.14?
> >
> > The idea is that experimental contains changes that need testing, but
> > may not yet be ready for your master. (They are generally safe,
> > though; I run StGit from my experimental branch at work, for example.)
> > When I decide that they are ready, I move them to safe. If there are
> > any patches you feel should be in safe rather than experimental, just
> > ask. Or you could just take them directly from experimental without
> > asking, of course. :-)
> 
> OK. My plan is to merge kha/safe and have a look at what seems safer
> to merge from kha/experimental. Fix bugs (and freeze the current
> features). Release 0.14. Merge kha/experimental entirely post 0.14 and
> test/stabilize it over couple of months. How does this sound?

Sounds like a good time to bring back my refactoring patches from the
hydra patchset.  I have not addressed yet the remarks that were voiced
at that time, and the hydra patch itself has not been completed, and
in fact the refactorings touch so many parts of the code that I can't
envision mantaining them outside the tree (in fact, I left them bitrot
for that very reason).  If there is no other remarks than those
already posted as replies to the patchset, maybe we could consider
merging them soon after kha/experimental ?

That would require that I update them, but I'm not sure Karl would
want them in kha/experimental, since virtually any other patch causes
a conflict...  The best situation would be that there would be a code
freeze at some time, during which I could update those patches without
too much perturbations, but that may be asking a lot :)

The ideal situation would be if we would make diffcore and merge aware
of a (de)indentation type of change.  That's something I have felt the
need for since ages, but I'm unfortunately not going to find the time
to implement that anytime soon :)

Best regards,
-- 
Yann

Re: Status of kha/experimental

[David Kågedal]

"Catalin Marinas" <catalin.marinas@gmail.com> writes:

> On 07/10/2007, Karl Hasselström <kha@treskal.com> wrote:
>> On 2007-10-07 22:18:44 +0100, Catalin Marinas wrote:
>>
>> > How stable is the kha/experimental branch? Since there are more and
>> > more bugs added to the tracking system, I'll have to start looking
>> > at them before a 0.14 release. Is it worth merging the
>> > kha/experimental now or we better wait for after 0.14?
>>
>> The idea is that experimental contains changes that need testing, but
>> may not yet be ready for your master. (They are generally safe,
>> though; I run StGit from my experimental branch at work, for example.)
>> When I decide that they are ready, I move them to safe. If there are
>> any patches you feel should be in safe rather than experimental, just
>> ask. Or you could just take them directly from experimental without
>> asking, of course. :-)
>
> OK. My plan is to merge kha/safe and have a look at what seems safer
> to merge from kha/experimental. Fix bugs (and freeze the current
> features). Release 0.14. Merge kha/experimental entirely post 0.14 and
> test/stabilize it over couple of months. How does this sound?

Sounds like a plan to me.  But we should probably fix the loose ends
in kha/experimental before merging it entirely.

-- 
David Kågedal

Re: Status of kha/experimental

[Karl Hasselström]

On 2007-10-10 09:39:15 +0200, David Kågedal wrote:

> Sounds like a plan to me. But we should probably fix the loose ends
> in kha/experimental before merging it entirely.

I tried to list the loose ends in my last update. There weren't that
many of them as I recall.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: Status of kha/experimental

[Karl Hasselström]

On 2007-10-09 23:46:13 +0200, Yann Dirson wrote:

> That would require that I update them, but I'm not sure Karl would
> want them in kha/experimental, since virtually any other patch
> causes a conflict...

Right. If it's likely to be many conflicts, I wouldn't mind if you
were the one who resolved them.

> The best situation would be that there would be a code freeze at
> some time, during which I could update those patches without too
> much perturbations, but that may be asking a lot :)

There aren't that many of us working on StGit. If you can give a
reasonably accurate start date and duration of the freeze, I don't
think it would be a problem. Others would simply have to be aware that
any patches not merged before the freeze would have to be rebased on
top of your work once the freeze is over.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: Status of kha/experimental

[Catalin Marinas]

On 10/10/2007, Karl Hasselström <kha@treskal.com> wrote:
> On 2007-10-09 23:46:13 +0200, Yann Dirson wrote:
> > The best situation would be that there would be a code freeze at
> > some time, during which I could update those patches without too
> > much perturbations, but that may be asking a lot :)
>
> There aren't that many of us working on StGit. If you can give a
> reasonably accurate start date and duration of the freeze,

This would mean that I have to be more organised :-).

> I don't
> think it would be a problem.Others would simply have to be aware that
> any patches not merged before the freeze would have to be rebased on
> top of your work once the freeze is over.

I'll try - let's say we freeze it starting with the coming Monday
(what's currently in kha/safe will be merged anyway) and aim to
release 0.14 in about 3 weeks (or as soon as we fix the major bugs).

-- 
Catalin

Re: Status of kha/experimental

[Karl Hasselström]

On 2007-10-11 21:38:12 +0100, Catalin Marinas wrote:

> I'll try - let's say we freeze it starting with the coming Monday
> (what's currently in kha/safe will be merged anyway) and aim to
> release 0.14 in about 3 weeks (or as soon as we fix the major bugs).

Do you have a list of the bugs you'd like to see fixed before the
release? (I don't, I'm not organized. :-) )

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: Status of kha/experimental

[Catalin Marinas]

On 12/10/2007, Karl Hasselström <kha@treskal.com> wrote:
> On 2007-10-11 21:38:12 +0100, Catalin Marinas wrote:
>
> > I'll try - let's say we freeze it starting with the coming Monday
> > (what's currently in kha/safe will be merged anyway) and aim to
> > release 0.14 in about 3 weeks (or as soon as we fix the major bugs).
>
> Do you have a list of the bugs you'd like to see fixed before the
> release? (I don't, I'm not organized. :-) )

https://gna.org/bugs/?group=stgit. All of them, if possible :-). If
you happen to work on any of them, change the "assigned to" filed so
that we don't duplicate the effort.

-- 
Catalin