[Geotools-devel] Just fix bugs, this time with geotiff example

[Jody G. <jga...@re...>]

Hi Bryce:

I finally caught with enough James - and a revised:
http://docs.codehaus.org/display/GEOTOOLS/Working+on+a+stable+branch

Document is the default, basically the usual geotools process (using 
maven, jalopy, etc...)
should be enough for the 2.1.x branch.

And fixes applied to the stable release should be applied to the trunk.

Thanks for your (and everyone's) feedback.

>Regarding #2-4: Should BEFORE and AFTER both be after the creation of the
>2.1.x trunk, or should BEFORE be the first change (a month ago)?  Also, the
>work log of GEOT-507 contains a stream of commits as chunks of the work
>were done.  There's no real good "before" and "after" because there were a
>couple of thousand commits during the month I was working on it.  I can dig
>up the earliest and latest ones, though, if that's what'll do the trick...
>Regarding #6: do you care which PMC gets assigned GeoTIFF (GEOT-507)?
>
>  
>
So with this new found plan, apply your changes using svn merge to the 
2.1.x branch.
I think for GEOT-507 you are focused on the geotiff reader ...

1. mkdir stable
2. svn co http://svn.geotools.org/geotools/branches/2.1.x/ stable
3. cd plugin/geotiff

I think you want to merge your geotiff changes on trunk into this directory?

So the first step is to see when 2.1.x branched off of trunk:

> C:\java\geotools\gt\plugin\geotiff>svn log --stop-on-copy
> ------------------------------------------------------------------------
> r13949 | jgarnett | 2005-05-30 15:06:59 -0700 (Mon, 30 May 2005) | 1 line
>
> Stable branch is targeted towards 2.1.RC0
> ------------------------------------------------------------------------
> r13923 | jgarnett | 2005-05-29 06:36:36 -0700 (Sun, 29 May 2005) | 1 line
>
> stable branch will be released as 2.1.0
> ------------------------------------------------------------------------

So 2.1.x was created at r13923 - that is BEFORE

Now lets check what happened on trunk ....

> C:\java\geotools\gt\plugin\geotiff>svn log -r 13923:HEAD 
> http://svn.geotools.org/geotools/trunk/gt/plugin/geotiff
> ------------------------------------------------------------------------
> r13954 | desruisseaux | 2005-05-30 16:57:16 -0700 (Mon, 30 May 2005) | 
> 1 line
>
> Removed deprecated CRS classes from trunk. Those classes will stay on 
> the 2.1 branch. The purpose for this removal is to
>  track down any remaining dependencies to old class names, if check if 
> those dependencies may hurt. A few dependencies (
> forgot during the renaming phase) were found, but none of them need to 
> be fixed in the 2.1 branch.
> ------------------------------------------------------------------------

I can't tell from the comment if we want that change for the branch or not?

Lets assume we did - here is how we would get it ...

> C:\java\geotools\gt\plugin\geotiff>svn merge -r 13923:13954 
> http://svn.geotools.org/geotools/trunk/gt/plugin/geotiff
> U  test\org\geotools\gce\geotiff\GeoTiffTest.java
> U  src\org\geotools\gce\geotiff\GeoTiffCoordinateSystemAdapter.java

So there were two changes, lets try our "maven test", that still works.

Okay it is worth doing the full "maven clean, build, createRelease" cycle.
Often when developing on trunk we don't do the createRelease test - but 
hey we are supposed to be stable.

If all goes well we can commit:
svn commit -m "Patched r 13923:13954 from trunk, Removed the last 
dependencies to the old CRS system - thanks martin"

And hope that CC does not find issue with the changes (is shouldn't).
If it did we could back out the change and commit:
svn merge -r 13954:13923 
http://svn.geotools.org/geotools/trunk/gt/plugin/geotiff
svn commit -m "Depatch 13954:13923 from trunk, removed a CRS dependency 
fix - no thanks martin"