From: Jody G. <jga...@re...> - 2004-05-23 01:49:52
|
Back now - Hack mode on If you are trying to work in the trunk right now you will get confused. Jody > I am going to go out for coffee, When I come back I will be setting up > the module merge on trunk. > > 1) Copy a "MODULE_MERGE_BEFORE" from trunk > 2) Rename directories to agree strucutre > 3) Copy a "MODULE_MERGE_STRUCTURE" tag > 4) Combine the requiredList.txt modules (svn-combine script available > at svn.geotools.org/geotools/scripts): > - src directories into main/src > - test directories into main/test > - sdocbook have conflicts (james recomendedremoval, I am going to try > and produce duplicates) in doc > 5) Copy a "MODULE_MERGE_COMBINE" tag > 6) Work on fixing maven.xml files (hoping James will step in and help?) > 5) Copy a "MODULE_MERGE_COMPILE" tag > > I know that is a lot of tags, I want to be able rollback any of the > above opperations when I get confused. |