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, [EMAIL PROTECTED] 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
[EMAIL PROTECTED]





--
Geir Magnusson Jr                                  +1-203-665-6437
[EMAIL PROTECTED]


Reply via email to