Merge the coverage branch to the trunk
--------------------------------------

         Key: GEOT-873
         URL: http://jira.codehaus.org/browse/GEOT-873
     Project: GeoTools
        Type: Task

  Components: core coverage  
    Versions: 2.3.M0    
    Reporter: Martin Desruisseaux
 Assigned to: Martin Desruisseaux 
    Priority: Critical
     Fix For: 2.3


We need to merge the coverage branch:

    http://svn.geotools.org/geotools/branches/coverages_branch/

to the trunk:

    http://svn.geotools.org/geotools/trunk/gt/

The trunk has been tagged before process to the merge:

    http://svn.geotools.org/geotools/tags/BEFORE_COVERAGE_BRANCH_MERGE/

Difference between the branch and the trunk can be inspected using the Unix 
"diff" command (the "svn diff" command is too verbose because SVN currently 
provides no way to ignore space changes, and a lot of classes have only 
formatting changes). Using "diff -b (and some other options)" do almost the 
trink. In addition, I use a small Java program of my own for filtering "diff" 
output and ommit uninterresting stuff like carriage returns. Inspecting the 
changes are quite easy with those tools.

The only significant change I found in the referencing module was the 
GeneralEnvelope.equals(...) method. I inspected most classes excepted the one 
related to factories, because the differences between "trunk" and "coverage 
branches" were too important because of GEOT-858 work. I assumed that all the 
changes were mine.

The changes in the coverage module are of course much more importants. The 
merge process is currently "copy-and-paste to trunk, review, refactor" on a 
method-by-method basis.


-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
   http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see:
   http://www.atlassian.com/software/jira


Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Geotools-devel mailing list
Geotools-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geotools-devel

Reply via email to