[Numpy-discussion] I've created a 1.0b1 release tag in SVN

[David M. Cooke]

On Wed, 26 Jul 2006 11:14:42 -0500
Robert Kern <robert.kern at gmail.com> wrote:

> Travis Oliphant wrote:
> > I've created the 1.0b1 release tag in SVN and will be uploading files 
> > shortly to Sourceforge.
> > 
> > I've also created a 1.0 release branch called ver1.0
> > 
> > The trunk is now version 1.1 of NumPy and should be used for 
> > new-development only.  I don't expect 1.1 to come out for at least a year.
> > 
> > Bug-fixes and small changes can happen on the 1.0 branch.  These will be 
> > merged periodically to 1.1 or vice-versa.  But, the 1.0 branch will be 
> > used for releases for the next year.
>  >
>  > AFAIK, this is similar to Python's release plan.
> 
> Let's not make a branch until 1.0 is actually out and we are making 1.0.x 
> releases. It's confusing since at the moment, the trunk is not getting any 
> activity. It's not the main trunk of development. Some people have already
> come to the list confused about where to get the code with fixes to the
> bugs they've reported. The branches are getting too far diverged at the
> moment. It's going to be hell merging them, and we are going to lose the
> revision history when we do merge. The revision messages won't be joined
> with the the changes they talk about.

That's one reason that I'm careful (or least try to be) in my change messages
to mention the ticket number for the bug fixed in the first line, so that
Trac will show it in the source browser, and to mention the revision number
of the fix in the ticket itself. The comment for stuff merged from one branch
to the other mentions which revisions are being merged from the original
branch (again, on the first line so Trac will see it). If applicable, add the
merge to the ticket also.

Merging a bug fix between trunks as soon as possible is a good idea too!

Then it's a relatively simple matter to browse through Trac and see what's
been merged, and what commits fix which.

-- 
|>|\/|<
/--------------------------------------------------------------------------\
|David M. Cooke                      http://arbutus.physics.mcmaster.ca/dmc/
|cookedm at physics.mcmaster.ca