You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2005/08/01 22:54:22 UTC
svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/
Author: dblevins
Date: Mon Aug 1 13:54:20 2005
New Revision: 226882
URL: http://svn.apache.org/viewcvs?rev=226882&view=rev
Log:
Making the M4 tag from the branch.
Added:
geronimo/tags/v1_0_M4/
- copied from r226881, geronimo/branches/v1_0_M4-QA/
Removed:
geronimo/branches/v1_0_M4-QA/
Re: svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/
Posted by Jeremy Boynes <jb...@apache.org>.
David Blevins wrote:
> That's fine. Can you update that, please? The stuff in tags/ are
> editable. Hvae to get on a plane for OSCON right now..
>
I removed the tag so we can create a new one when the branch is ready.
--
Jeremy
Re: svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/
Posted by David Blevins <da...@visi.com>.
That's fine. Can you update that, please? The stuff in tags/ are editable. Hvae to get on a plane for OSCON right now..
On Mon, Aug 01, 2005 at 03:12:56PM -0700, Jeremy Boynes wrote:
> -1
>
> This tag still contains references to SNAPSHOTs and hence things cannot
> reliably be built from it.
>
> --
> Jeremy
>
> dblevins@apache.org wrote:
> >Author: dblevins
> >Date: Mon Aug 1 13:54:20 2005
> >New Revision: 226882
> >
> >URL: http://svn.apache.org/viewcvs?rev=226882&view=rev
> >Log:
> >Making the M4 tag from the branch.
> >
> >Added:
> > geronimo/tags/v1_0_M4/
> > - copied from r226881, geronimo/branches/v1_0_M4-QA/
> >Removed:
> > geronimo/branches/v1_0_M4-QA/
> >
Re: svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/
Posted by Jeremy Boynes <jb...@apache.org>.
-1
This tag still contains references to SNAPSHOTs and hence things cannot
reliably be built from it.
--
Jeremy
dblevins@apache.org wrote:
> Author: dblevins
> Date: Mon Aug 1 13:54:20 2005
> New Revision: 226882
>
> URL: http://svn.apache.org/viewcvs?rev=226882&view=rev
> Log:
> Making the M4 tag from the branch.
>
> Added:
> geronimo/tags/v1_0_M4/
> - copied from r226881, geronimo/branches/v1_0_M4-QA/
> Removed:
> geronimo/branches/v1_0_M4-QA/
>
Re: milestone branching and taging (was Re: svn commit: r226882 -
in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/)
Posted by Aaron Mulder <am...@alumni.princeton.edu>.
On Wed, 3 Aug 2005, David Blevins wrote:
> You've described my ideal setup for 1.0 and beyond, but we aren't
> doing dot releases yet.
>
> There is never going to be another release from the M4-QA branch.
> It's a dead branch and shouldn't be updated after we vote to release
> the M4 binaries.
I'm OK with deleting a branch *after* the release has been voted
and distributed. But since we have to make the tag before that, I really
don't like deleting the branch when making the tag. Why do you object to
making the tag a *copy* of the branch?
Aaron
Re: milestone branching and taging (was Re: svn commit: r226882 -
in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/)
Posted by "Alan D. Cabrera" <li...@toolazydogs.com>.
Geir Magnusson Jr. wrote, On 8/3/2005 1:57 PM:
>
> On Aug 3, 2005, at 4:14 PM, David Blevins wrote:
>
>> On Wed, Aug 03, 2005 at 09:04:22AM -0400, Geir Magnusson Jr. wrote:
>
>> There is never going to be another release from the M4-QA branch.
>> It's a dead branch and shouldn't be updated after we vote to release
>> the M4 binaries.
>
>
> Why wouldn't we set a process that's standard and stick with it?
>
> Further, it's entirely reasonable to keep our option open for a
> subsequent release of M4. Remember M3? And what if we find a major
> problem? We don't want to ram forward a M5 - we'd want to fix M4 and
> get that out there, retracting the problematic release, say a M4r1.
This makes sense to me.
Regards,
Alan
Re: milestone branching and taging (was Re: svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/)
Posted by "Geir Magnusson Jr." <ge...@apache.org>.
On Aug 3, 2005, at 4:14 PM, David Blevins wrote:
> On Wed, Aug 03, 2005 at 09:04:22AM -0400, Geir Magnusson Jr. wrote:
>
>>
>> On Aug 2, 2005, at 9:41 PM, David Blevins wrote:
>>
>>
>>> On Mon, Aug 01, 2005 at 07:16:23PM -0400, Geir Magnusson Jr. wrote:
>>>
>>>
>>>> no, you moved...
>>>>
>>>> we never want to move branches, but copy to make tags, and never
>>>> modify the tags. That way, if we need to keep going on the branch,
>>>> we have it.
>>>>
>>>>
>>>
>>> We agreed on this proceedure a month ago.
>>>
>>
>> Clearly we agreed on a mistake then. I didn't read it carefully.
>> Sorry.
>>
>> We want to be able to branch, work on the branch, and then tag for a
>> release (call it vX.0) Nothing in the tag is different from the
>> branch it came from - it's effectively a pointer to a moment in time
>> (revision) on the branch.
>>
>> Now, suppose we have a security issue for which we want to do an
>> update on the thing we released. So we then must go back to the
>> *branch*, fix the bug, tag again (vX.0.1).
>>
>>
>
> You've described my ideal setup for 1.0 and beyond, but we aren't
> doing dot releases yet.
>
It shouldn't matter.
> There is never going to be another release from the M4-QA branch.
> It's a dead branch and shouldn't be updated after we vote to release
> the M4 binaries.
Why wouldn't we set a process that's standard and stick with it?
Further, it's entirely reasonable to keep our option open for a
subsequent release of M4. Remember M3? And what if we find a major
problem? We don't want to ram forward a M5 - we'd want to fix M4 and
get that out there, retracting the problematic release, say a M4r1.
geir
--
Geir Magnusson Jr +1-203-665-6437
geirm@apache.org
milestone branching and taging (was Re: svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/)
Posted by David Blevins <da...@visi.com>.
On Wed, Aug 03, 2005 at 09:04:22AM -0400, Geir Magnusson Jr. wrote:
>
> On Aug 2, 2005, at 9:41 PM, David Blevins wrote:
>
> >On Mon, Aug 01, 2005 at 07:16:23PM -0400, Geir Magnusson Jr. wrote:
> >
> >>no, you moved...
> >>
> >>we never want to move branches, but copy to make tags, and never
> >>modify the tags. That way, if we need to keep going on the branch,
> >>we have it.
> >>
> >
> >We agreed on this proceedure a month ago.
>
> Clearly we agreed on a mistake then. I didn't read it carefully.
> Sorry.
>
> We want to be able to branch, work on the branch, and then tag for a
> release (call it vX.0) Nothing in the tag is different from the
> branch it came from - it's effectively a pointer to a moment in time
> (revision) on the branch.
>
> Now, suppose we have a security issue for which we want to do an
> update on the thing we released. So we then must go back to the
> *branch*, fix the bug, tag again (vX.0.1).
>
You've described my ideal setup for 1.0 and beyond, but we aren't
doing dot releases yet.
There is never going to be another release from the M4-QA branch.
It's a dead branch and shouldn't be updated after we vote to release
the M4 binaries.
-David
Re: svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/
Posted by "Geir Magnusson Jr." <ge...@apache.org>.
On Aug 2, 2005, at 9:41 PM, David Blevins wrote:
> On Mon, Aug 01, 2005 at 07:16:23PM -0400, Geir Magnusson Jr. wrote:
>
>> no, you moved...
>>
>> we never want to move branches, but copy to make tags, and never
>> modify the tags. That way, if we need to keep going on the branch,
>> we have it.
>>
>
> We agreed on this proceedure a month ago.
Clearly we agreed on a mistake then. I didn't read it carefully.
Sorry.
We want to be able to branch, work on the branch, and then tag for a
release (call it vX.0) Nothing in the tag is different from the
branch it came from - it's effectively a pointer to a moment in time
(revision) on the branch.
Now, suppose we have a security issue for which we want to do an
update on the thing we released. So we then must go back to the
*branch*, fix the bug, tag again (vX.0.1).
So the change I would suggest then is to not name our branch with any
sort of modifier indicating state like "prep" or "QA" or whatever,
but branch for version, from which one or more tags for release are
created.
geir
>
>
>> On Jul 4, 2005, at 6:38 PM, Jeremy Boynes wrote:
>>
>> So basically,
>> * create a branch now, say 1.0-M4-prep
>> * do the stuff we talking about now on that branch
>> * cut the final M4 distro
>> * drop the 1.0-M4-prep branch
>>
>
>
> -David
>
>
>
>
>>
>> geir
>>
>> On Aug 1, 2005, at 4:54 PM, dblevins@apache.org wrote:
>>
>>
>>> Author: dblevins
>>> Date: Mon Aug 1 13:54:20 2005
>>> New Revision: 226882
>>>
>>> URL: http://svn.apache.org/viewcvs?rev=226882&view=rev
>>> Log:
>>> Making the M4 tag from the branch.
>>>
>>> Added:
>>> geronimo/tags/v1_0_M4/
>>> - copied from r226881, geronimo/branches/v1_0_M4-QA/
>>> Removed:
>>> geronimo/branches/v1_0_M4-QA/
>>>
>>>
>>>
>>
>> --
>> Geir Magnusson Jr +1-203-665-6437
>> geirm@apache.org
>>
>>
>
>
--
Geir Magnusson Jr +1-203-665-6437
geirm@apache.org
Re: svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/
tags/v1_0_M4/
Posted by Aaron Mulder <am...@alumni.princeton.edu>.
I think it makes a lot more sense to work in the branch, and when
we're ready, copy the current state of the branch as the tag. I don't
think we should move the branch to make it the tag. If I agreed to the
opposite a month ago then the mess the other day convinced me of the error
of my ways.
Aaron
On Tue, 2 Aug 2005, David Blevins wrote:
> On Mon, Aug 01, 2005 at 07:16:23PM -0400, Geir Magnusson Jr. wrote:
> > no, you moved...
> >
> > we never want to move branches, but copy to make tags, and never
> > modify the tags. That way, if we need to keep going on the branch,
> > we have it.
>
> We agreed on this proceedure a month ago.
>
> > On Jul 4, 2005, at 6:38 PM, Jeremy Boynes wrote:
> >
> > So basically,
> > * create a branch now, say 1.0-M4-prep
> > * do the stuff we talking about now on that branch
> > * cut the final M4 distro
> > * drop the 1.0-M4-prep branch
>
>
> -David
>
>
>
> >
> > geir
> >
> > On Aug 1, 2005, at 4:54 PM, dblevins@apache.org wrote:
> >
> > >Author: dblevins
> > >Date: Mon Aug 1 13:54:20 2005
> > >New Revision: 226882
> > >
> > >URL: http://svn.apache.org/viewcvs?rev=226882&view=rev
> > >Log:
> > >Making the M4 tag from the branch.
> > >
> > >Added:
> > > geronimo/tags/v1_0_M4/
> > > - copied from r226881, geronimo/branches/v1_0_M4-QA/
> > >Removed:
> > > geronimo/branches/v1_0_M4-QA/
> > >
> > >
> >
> > --
> > Geir Magnusson Jr +1-203-665-6437
> > geirm@apache.org
> >
>
Re: svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/
Posted by David Blevins <da...@visi.com>.
On Mon, Aug 01, 2005 at 07:16:23PM -0400, Geir Magnusson Jr. wrote:
> no, you moved...
>
> we never want to move branches, but copy to make tags, and never
> modify the tags. That way, if we need to keep going on the branch,
> we have it.
We agreed on this proceedure a month ago.
> On Jul 4, 2005, at 6:38 PM, Jeremy Boynes wrote:
>
> So basically,
> * create a branch now, say 1.0-M4-prep
> * do the stuff we talking about now on that branch
> * cut the final M4 distro
> * drop the 1.0-M4-prep branch
-David
>
> geir
>
> On Aug 1, 2005, at 4:54 PM, dblevins@apache.org wrote:
>
> >Author: dblevins
> >Date: Mon Aug 1 13:54:20 2005
> >New Revision: 226882
> >
> >URL: http://svn.apache.org/viewcvs?rev=226882&view=rev
> >Log:
> >Making the M4 tag from the branch.
> >
> >Added:
> > geronimo/tags/v1_0_M4/
> > - copied from r226881, geronimo/branches/v1_0_M4-QA/
> >Removed:
> > geronimo/branches/v1_0_M4-QA/
> >
> >
>
> --
> Geir Magnusson Jr +1-203-665-6437
> geirm@apache.org
>
Re: svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/
Posted by David Blevins <da...@visi.com>.
On Mon, Aug 01, 2005 at 07:16:23PM -0400, Geir Magnusson Jr. wrote:
> no, you moved...
>
> we never want to move branches, but copy to make tags, and never
> modify the tags. That way, if we need to keep going on the branch,
> we have it.
We agreed on this proceedure a month ago.
> On Jul 4, 2005, at 6:38 PM, Jeremy Boynes wrote:
>
> So basically,
> * create a branch now, say 1.0-M4-prep
> * do the stuff we talking about now on that branch
> * cut the final M4 distro
> * drop the 1.0-M4-prep branch
-David
>
> geir
>
> On Aug 1, 2005, at 4:54 PM, dblevins@apache.org wrote:
>
> >Author: dblevins
> >Date: Mon Aug 1 13:54:20 2005
> >New Revision: 226882
> >
> >URL: http://svn.apache.org/viewcvs?rev=226882&view=rev
> >Log:
> >Making the M4 tag from the branch.
> >
> >Added:
> > geronimo/tags/v1_0_M4/
> > - copied from r226881, geronimo/branches/v1_0_M4-QA/
> >Removed:
> > geronimo/branches/v1_0_M4-QA/
> >
> >
>
> --
> Geir Magnusson Jr +1-203-665-6437
> geirm@apache.org
>
Re: svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/
Posted by "Geir Magnusson Jr." <ge...@apache.org>.
no, you moved...
we never want to move branches, but copy to make tags, and never
modify the tags. That way, if we need to keep going on the branch,
we have it.
geir
On Aug 1, 2005, at 4:54 PM, dblevins@apache.org wrote:
> Author: dblevins
> Date: Mon Aug 1 13:54:20 2005
> New Revision: 226882
>
> URL: http://svn.apache.org/viewcvs?rev=226882&view=rev
> Log:
> Making the M4 tag from the branch.
>
> Added:
> geronimo/tags/v1_0_M4/
> - copied from r226881, geronimo/branches/v1_0_M4-QA/
> Removed:
> geronimo/branches/v1_0_M4-QA/
>
>
--
Geir Magnusson Jr +1-203-665-6437
geirm@apache.org
Re: svn commit: r226882 - in /geronimo: branches/v1_0_M4-QA/ tags/v1_0_M4/
Posted by "Geir Magnusson Jr." <ge...@apache.org>.
no, you moved...
we never want to move branches, but copy to make tags, and never
modify the tags. That way, if we need to keep going on the branch,
we have it.
geir
On Aug 1, 2005, at 4:54 PM, dblevins@apache.org wrote:
> Author: dblevins
> Date: Mon Aug 1 13:54:20 2005
> New Revision: 226882
>
> URL: http://svn.apache.org/viewcvs?rev=226882&view=rev
> Log:
> Making the M4 tag from the branch.
>
> Added:
> geronimo/tags/v1_0_M4/
> - copied from r226881, geronimo/branches/v1_0_M4-QA/
> Removed:
> geronimo/branches/v1_0_M4-QA/
>
>
--
Geir Magnusson Jr +1-203-665-6437
geirm@apache.org