search

piccolo2d / piccolo2d.java

Structured 2D Graphics Framework
http://piccolo2d.org
Other
51 stars 14 forks source link

Move 1.x development to a branch and move 2.0 to trunk #171

Closed mro closed 9 years ago

mro commented 9 years ago

Originally reported on Google Code with ID 171

As part of the 1.3 release, which will be made on trunk, a release branch
branches/release-1.3 will be created in subversion.

I propose we should do the following:

On branches/release-1.3, update the version in the maven poms to
1.4-SNAPSHOT.  This will allow 1.3.x releases if any and the 1.4 release to
occur on this branch.

On trunk, update the version in the maven poms to 2.0-SNAPSHOT.  Then,
using remote subversion moves, refactor the package structure from
edu.umd.cs.piccolo to org.piccolo2d (see Issue 37).  These moves should
retain all the revision history for each file.

After the package refactoring, branch/2.0-spike can be merged to trunk. 
Care needs to be taken that revision history is retained during this merge.

Reported by heuermh on 2010-03-10 22:00:54

mro commented 9 years ago 
$ svn commit -m "updating version to 1.4-SNAPSHOT, scm links to branches/release-1.3"
.
Sending        core/pom.xml
Sending        examples/pom.xml
Sending        extras/pom.xml
Sending        parent/pom.xml
Sending        pom.xml
Sending        swt/pom.xml
Sending        swt-examples/pom.xml
Transmitting file data .......
Committed revision 987.

Reported by heuermh on 2010-03-11 02:52:06

mro commented 9 years ago 
$ svn commit -m "updating version to 2.0-SNAPSHOT" .
Sending        core/pom.xml
Sending        examples/pom.xml
Sending        extras/pom.xml
Sending        parent/pom.xml
Sending        pom.xml
Sending        swt/pom.xml
Sending        swt-examples/pom.xml
Transmitting file data .......
Committed revision 988.

Reported by heuermh on 2010-03-11 02:55:18

mro commented 9 years ago 
I'll pause here for comment before proceeding further.

Reported by heuermh on 2010-03-11 02:55:53

mro commented 9 years ago 
release-1.3 should be a tag and untouchable.

Since bug fixes will be released in 1.4, we should have a 1.4 branch that goes
through the various version.

Reported by allain.lalonde on 2010-03-11 13:23:26

mro commented 9 years ago 
release-1.3 is also a tag, in tags/release-1.3.

release-1.3 is the branch point for all further 1.x releases.  Bugfixes might be
released as 1.3.1, 1.3.2, etc. before 1.4 is ready.

Reported by heuermh on 2010-03-11 16:12:42

mro commented 9 years ago 
yup, forgot about minor point releases.

Reported by allain.lalonde on 2010-03-11 16:19:07

mro commented 9 years ago 
Hmm, it appears that I have underestimated subversion.  The full revision history for
PNode.java is present in the 2.0-spike branch, even with the package refactoring.

$ svn log core/src/main/java/org/piccolo2d/PNode.java
------------------------------------------------------------------------
r959 | allain.lalonde | 2010-01-26 10:58:01 -0600 (Tue, 26 Jan 2010) | 1 line

Fixing some find bugs warnings and Making PText use an enum for specification of
HorizontalAlignment, making a bunch of error chec
king unnecessary.
------------------------------------------------------------------------
...
r924 | allain.lalonde | 2010-01-14 14:47:26 -0600 (Thu, 14 Jan 2010) | 1 line

Creating 2.0 spike branch. This will be used to continue development until 1.3 final
goes out.
------------------------------------------------------------------------
r878 | heuermh | 2009-10-31 21:26:38 -0500 (Sat, 31 Oct 2009) | 1 line

adding @since 1.3 tags in core where clirr report identified new items
...
------------------------------------------------------------------------
r113 | mr.rohrmoser | 2008-07-21 05:07:05 -0500 (Mon, 21 Jul 2008) | 1 line

issue#38 relocate svn base
------------------------------------------------------------------------
r6 | jesse | 2006-10-04 21:35:06 -0500 (Wed, 04 Oct 2006) | 1 line

piccolo java
------------------------------------------------------------------------

Maybe all we need then is a single svn remote repository merge?

$ svn merge -m "merging 2.0-spike branch to trunk"
https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/2.0-spike
https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk

Reported by heuermh on 2010-03-11 17:03:10

mro commented 9 years ago 
Sorry, that's not right . . . back to reading the svn manual.

Reported by heuermh on 2010-03-11 17:09:10

mro commented 9 years ago 
After discussion with allain.lalonde, we're not going to worry about merging
2.0-spike to trunk.  Rather that branch will be used as a point of reference for
making 2.0-related changes to trunk.

Reported by heuermh on 2010-03-18 18:24:33

mro commented 9 years ago

Reported by heuermh on 2013-11-26 20:47:09