Experimental branch of GRUB

Experimental branch of GRUB

[Robert Millan]

[-- Attachment #1: Type: text/plain, Size: 917 bytes --]


Hi,

An experimental branch of GNU GRUB is now available:

  # readonly access
  bzr branch http://bzr.savannah.gnu.org/r/grub/branches/experimental/

  # member access
  bzr branch sftp://<username>@bzr.savannah.gnu.org/srv/bzr/grub/branches/experimental

The purpose of this branch is to serve as staging area so that new code can
be tested and collaboratively maintained when we expect that it will be
eventually merged into trunk, but it is not yet ready for this (e.g. too
inmature or wrong time in the development cycle).

I'm appointing Vladimir Serbinenko as the developer in charge of this branch.
Patches may be merged in it at his discretion.

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 835 bytes --]

Re: Experimental branch of GRUB

[Felix Zielcke]

Am Samstag, den 24.10.2009, 15:06 +0200 schrieb Robert Millan:
> 
> An experimental branch of GNU GRUB is now available:
> 
[...]
> 
> I'm appointing Vladimir Serbinenko as the developer in charge of this branch.
> Patches may be merged in it at his discretion. 

Vladimir whats your policy for merging trunk into experimental?
Do you want to track it on your own to keep them in sync?


-- 
Felix Zielcke
Proud Debian Maintainer and GNU GRUB developer

Re: Experimental branch of GRUB

[Robert Millan]

On Sat, Oct 31, 2009 at 03:49:27PM +0100, Felix Zielcke wrote:
> Am Samstag, den 24.10.2009, 15:06 +0200 schrieb Robert Millan:
> > 
> > An experimental branch of GNU GRUB is now available:
> > 
> [...]
> > 
> > I'm appointing Vladimir Serbinenko as the developer in charge of this branch.
> > Patches may be merged in it at his discretion. 
> 
> Vladimir whats your policy for merging trunk into experimental?
> Do you want to track it on your own to keep them in sync?

Experimental is the staging area for trunk, not the other way around.
Everything that is already in trunk is also ok for experimental.

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."

Re: Experimental branch of GRUB

[Vladimir 'phcoder' Serbinenko]

Felix Zielcke wrote:
> Am Samstag, den 24.10.2009, 15:06 +0200 schrieb Robert Millan:
>   
>> An experimental branch of GNU GRUB is now available:
>>
>>     
> [...]
>   
>> I'm appointing Vladimir Serbinenko as the developer in charge of this branch.
>> Patches may be merged in it at his discretion. 
>>     
>
> Vladimir whats your policy for merging trunk into experimental?
> Do you want to track it on your own to keep them in sync?
>
>
>   
As nyu said everything which is ok for mainline is ok for experimental
and so the only issue are conflicts but in practice any sane way to
resolve them is ok. So I feel like no discussion should be necessary
about this


-- 
Regards
Vladimir 'phcoder' Serbinenko
Personal git repository: http://repo.or.cz/w/grub2/phcoder.git 

Re: Experimental branch of GRUB

[Felix Zielcke]

Am Samstag, den 31.10.2009, 19:33 +0100 schrieb Vladimir 'phcoder'
Serbinenko:
> Felix Zielcke wrote:
> > Am Samstag, den 24.10.2009, 15:06 +0200 schrieb Robert Millan:
> >   
> >> An experimental branch of GNU GRUB is now available:
> >>
> >>     
> > [...]
> >   
> >> I'm appointing Vladimir Serbinenko as the developer in charge of this branch.
> >> Patches may be merged in it at his discretion. 
> >>     
> >
> > Vladimir whats your policy for merging trunk into experimental?
> > Do you want to track it on your own to keep them in sync?
> >
> >
> >   
> As nyu said everything which is ok for mainline is ok for experimental
> and so the only issue are conflicts but in practice any sane way to
> resolve them is ok. So I feel like no discussion should be necessary
> about this
> 

Well my question was mainly `Do you want to merge trunk into it or can
anyone of us do it?'
But seems like so :)


-- 
Felix Zielcke
Proud Debian Maintainer and GNU GRUB developer

Re: Experimental branch of GRUB

[Vladimir 'phcoder' Serbinenko]

Felix Zielcke wrote:
> Am Samstag, den 31.10.2009, 19:33 +0100 schrieb Vladimir 'phcoder'
> Serbinenko:
>   
>> Felix Zielcke wrote:
>>     
>>> Am Samstag, den 24.10.2009, 15:06 +0200 schrieb Robert Millan:
>>>   
>>>       
>>>> An experimental branch of GNU GRUB is now available:
>>>>
>>>>     
>>>>         
>>> [...]
>>>   
>>>       
>>>> I'm appointing Vladimir Serbinenko as the developer in charge of this branch.
>>>> Patches may be merged in it at his discretion. 
>>>>     
>>>>         
>>> Vladimir whats your policy for merging trunk into experimental?
>>> Do you want to track it on your own to keep them in sync?
>>>
>>>
>>>   
>>>       
>> As nyu said everything which is ok for mainline is ok for experimental
>> and so the only issue are conflicts but in practice any sane way to
>> resolve them is ok. So I feel like no discussion should be necessary
>> about this
>>
>>     
>
> Well my question was mainly `Do you want to merge trunk into it or can
> anyone of us do it?'
> But seems like so :)
>
>   
In case of no conflicts or its trivial resolution you can do it. If it's
more problematic please contact me


-- 
Regards
Vladimir 'phcoder' Serbinenko
Personal git repository: http://repo.or.cz/w/grub2/phcoder.git 

Re: Experimental branch of GRUB

[Vladimir 'phcoder' Serbinenko]

Robert Millan wrote:
> Hi,
>
> An experimental branch of GNU GRUB is now available:
>
>   # readonly access
>   bzr branch http://bzr.savannah.gnu.org/r/grub/branches/experimental/
>
>   # member access
>   bzr branch sftp://<username>@bzr.savannah.gnu.org/srv/bzr/grub/branches/experimental
>
> The purpose of this branch is to serve as staging area so that new code can
> be tested and collaboratively maintained when we expect that it will be
> eventually merged into trunk, but it is not yet ready for this (e.g. too
> inmature or wrong time in the development cycle).
>
> I'm appointing Vladimir Serbinenko as the developer in charge of this branch.
> Patches may be merged in it at his discretion.
>
>   
Just few points about it
1) Use separate ChangeLog file for experimental features. E.g. I'll use
ChangeLog.mips for my mips branch. No need to mention all the history,
only what needs to be put when feature is merged back in mainline.
2) Members are encouraged to use /people/<name>/<feature> branches to
simplifiy the management and merging to mainline once feature is
considered mature
3) For non-members which have copyright assignment send the patch I'll
apply it
4) Any inclusion of material non-covered by copyright assignment is
above my authority and have to be approved by maintainer
> ------------------------------------------------------------------------
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel
>   


-- 
Regards
Vladimir 'phcoder' Serbinenko
Personal git repository: http://repo.or.cz/w/grub2/phcoder.git 

Re: Experimental branch of GRUB

[Robert Millan]

On Sat, Oct 31, 2009 at 07:37:22PM +0100, Vladimir 'phcoder' Serbinenko wrote:
> 1) Use separate ChangeLog file for experimental features. E.g. I'll use
> ChangeLog.mips for my mips branch. No need to mention all the history,
> only what needs to be put when feature is merged back in mainline.

Since you suggested this earlier on IRC, I tentatively used
"ChangeLog.experimental" for the existing changelog entries when restoring
the repository.  But feel free to change that.

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."