openjpa-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Geir Magnusson Jr." <g...@pobox.com>
Subject Re: Branch or tag?
Date Tue, 21 Nov 2006 19:26:08 GMT
Interesting - another approach that I've used when the trunk is kept in 
a releasable state, you can tag the trunk for a release, ex 1.1, and 
then if you need to keep working on that for bugfixes (1.1.1), you do a 
branch and keep going.

Many ways to skin this cat...

Kevin Sutter wrote:
> Good points, Craig.
> 
> Since there is always the possibility of maintaining a branch, we need a 
> tag
> to represent the beginning of that branch -- with no changes ever being
> committed to the tag.  And, since I don't want to be tied to some 
> particular
> naming convention (and I think it would be very confusing), I don't want to
> pre-create a branch.
> 
> Bottom line, there is a need and desire for both tags and branches.  And, I
> agree with Craig, that we don't create the tag until we are sure that a
> given branch is released.
> 
> Kevin
> 
> On 11/21/06, Craig L Russell <Craig.Russell@sun.com> wrote:
>>
>> Hi Kevin,
>>
>> It's my understanding as well that there's no difference between a
>> branch and a tag from the svn perspective.
>>
>> I'd like to see the tag created only after we release, if at all. The
>> question for me is whether we would ever change the branch for 0.9.6
>> after we release it. If not, then I agree that there is no need for a
>> tag as well.
>>
>> But to take perhaps a more interesting sequence, let's say we release
>> OpenJPA 1.1. We create the 1.1 branch and release it, while changing
>> the trunk to be 1.2-SNAPSHOT. Now we have a bunch of bug fixes for
>> 1.1 and want to release a 1.1.1. We have a choice between a) doing
>> the bug fixing on the 1.1 branch itself and creating the 1.1.1 branch
>> when we want to release 1.1.1; OR b) create the 1.1.1 branch
>> immediately after releasing the 1.1 branch.
>>
>> With a, we need to tag the 1.1 branch before applying any bug fixes.
>> With b, we don't need to tag but have to remember that any bug fixes
>> should be applied to 1.1.1 branch instead of the 1.1 branch.
>>
>> Craig
>>
>> On Nov 21, 2006, at 8:16 AM, Kevin Sutter wrote:
>>
>> > Marc,
>> > +1 for the 0.9.6 release
>> >
>> > Question though...  Since tags and branches are virtually the same
>> > thing in
>> > SVN, do we really need to have both the tagged version and the
>> > branch?  It
>> > seems that the branch would be sufficient and then just remove the
>> > tags
>> > folder altogether.  Unless I am missing some aspect of the tag that
>> > you are
>> > taking advantage of...
>> >
>> > Kevin
>> >
>> >
>> > On 11/20/06, Marc Prud'hommeaux <mprudhom@apache.org> wrote:
>> >>
>> >> OpenJPA People-
>> >>
>> >> In accordance with the Incubating Releases guidelines at  http://
>> >> incubator.apache.org/incubation/Incubation_Policy.html#Releases , I'd
>> >> like to take a third shot at making an OpenJPA release and start a
>> >> vote on publishing a "0.9.6-incubating" release of OpenJPA. The last
>> >> couple votes failed due to some problems with the notice file and
>> >> some source files that were missing license headers and other
>> >> miscellaneous issues.
>> >>
>> >> The release candidate is at:
>> >>
>> >> http://people.apache.org/repo/m2-incubating-repository/org/apache/
>> >> openjpa/openjpa-project/0.9.6-incubating/openjpa-project-0.9.6-
>> >> incubating-binary.zip
>> >>
>> >> The GPG signature and MD5 checksums are at:
>> >>
>> >>   http://people.apache.org/repo/m2-incubating-repository/org/apache/
>> >> openjpa/openjpa-project/0.9.6-incubating/openjpa-project-0.9.6-
>> >> incubating-binary.zip.asc
>> >>   http://people.apache.org/repo/m2-incubating-repository/org/apache/
>> >> openjpa/openjpa-project/0.9.6-incubating/openjpa-project-0.9.6-
>> >> incubating-binary.zip.md5
>> >>
>> >> The sources, sources GPG signature and sources MD5 checksum are
>> >> available at:
>> >>
>> >>   http://people.apache.org/repo/m2-incubating-repository/org/apache/
>> >> openjpa/openjpa-project/0.9.6-incubating/openjpa-project-0.9.6-
>> >> incubating-source.zip
>> >>   http://people.apache.org/repo/m2-incubating-repository/org/apache/
>> >> openjpa/openjpa-project/0.9.6-incubating/openjpa-project-0.9.6-
>> >> incubating-source.zip.asc
>> >>   http://people.apache.org/repo/m2-incubating-repository/org/apache/
>> >> openjpa/openjpa-project/0.9.6-incubating/openjpa-project-0.9.6-
>> >> incubating-source.zip.md5
>> >>
>> >> This build was cut from the branch at:
>> >>
>> >>   https://svn.apache.org/repos/asf/incubator/openjpa/branches/0.9.6-
>> >> incubating/
>> >>
>> >> I have tagged the sources at:
>> >>
>> >>   https://svn.apache.org/repos/asf/incubator/openjpa/tags/0.9.6-
>> >> incubating/
>> >>
>> >> Please vote to publish this incubating release on the project web
>> >> page:
>> >>
>> >>   http://cwiki.apache.org/openjpa/downloads.html
>> >>
>> >> This vote will remain open until 11:00PM EST on Thursday November
>> >> 23rd. A "+1" indicates that you approve of the release, a "-1"
>> >> indicates a vote against making a release.
>> >>
>> >> I'll get the ball rolling by adding my own vote: +1
>> >>
>> >>
>> >>
>> >>
>>
>> Craig Russell
>> Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
>> 408 276-5638 mailto:Craig.Russell@sun.com
>> P.S. A good JDO? O, Gasp!
>>
>>
>>
>>
> 

Mime
View raw message