"Seegrid will be due for a migration to confluence on the 1st of August. Any update on or after the 1st of August will NOT be migrated"

Developing GeoServer / GeoTools with the Git Distributed Version Control System

Clone svn repositories from roughly the start of 2009

Fix GeoServer externals

  • Git does not handle svn externals. To build GeoServer, create the following symbolic links at the top level:
    • ln -sfn ../../../data/minimal src/web/app/minimal
    • ln -sfn ../../../../../../../../../../src/web/core/src/main/java/org/geoserver/web/css src/web/app/src/test/java/org/geoserver/wicket/test/css
    • ln -sfn ../../../../../../../../../../src/web/core/src/main/java/org/geoserver/web/img src/web/app/src/test/java/org/geoserver/wicket/test/img
    • ln -sfn ../../data/citewfs-1.1/styles data/citewfs-1.1-h2/styles

TortoiseSVN

  • TortoiseSVN does not read diffs created by git. The attached Python script converts a git diff into something more likely to be accepted by TortoiseSVN.
    • tortoise: Python script (a filter) to convert a git diff into something TortoiseSVN can read
  • Alternative that may work are using patch or Eclipse.

Resources

Topic attachments
I Attachment Action Size Date Who Comment
tortoiseEXT tortoise manage 1.7 K 04 Feb 2011 - 15:56 BenCaradocDavies Python script (a filter) to convert a git diff into something TortoiseSVN can read
Topic revision: r2 - 08 Apr 2011, BenCaradocDavies
 

Current license: All material on this collaboration platform is licensed under a Creative Commons Attribution 3.0 Australia Licence (CC BY 3.0).