Thanks martin - I must of screwed up trying to follow your directions ... here is what I did: #1 used svn merge -rHEAD:XXXX to roll back my changes #2 used svn cp FactoryGroup.java ReferencingFactoryContainer.java #3 made FactoryGroup extend ReferencingFactoryContainer (and messed with the instance methods so that they made sense) #4 svn commit
I assumed #2 was the change you were looking for; it sounds like I needed to specify a revision (simply reverting first was not good enough). Sigh. Jody > I fixed history on SVN for the following files: > > BufferedAuthorityFactory.java > FactoryGroup.java > GeotoolsFactory.java > ReferencingFactoryContainer.java > ReferencingObjectFactory.java > ThreadedAuthorityFactory.java > > > Next time that history is broken, maybe we should fix one file together. > Fixing > "broken fix for broken history" is more difficult that fixing "broken > history". > > Example: Renaming ReferencingObjectFactory.java: > > If nothing was broken: > ---------------------- > svn copy GeotoolsFactory.java ReferencingObjectFactory.java > > note that if we keep the legacy class (for "deprecate then remove" cycle), we > use "svn copy", not "svn move". Do not perform "svn remove" on the old class. > > If history was broken: > ---------------------- > svn copy -r 25887 > http://svn.geotools.org/geotools/trunk/gt/modules/library/referencing/src/main/java/org/geotools/referencing/factory/GeotoolsFactory.java > > ReferencingObjectFactory.java > > > > One additional note about SVN: the following files were commited with > "svn:executable" attribute set, which is wrong: > > DefaultReferencingObjectCache.java > NullReferencingObjectCache.java > ReferencingObjectCache.java > > I guess that those files were commited with TortoiseSVN or SubEclipse on a > Windows platform. I will fix them. > > Please consider the following policy: never use GUI for any operation > writting > on SVN; always use the "svn" command line. I know it is less pretty, but we > make > less mistake with the command line. It was also a Ian Schneider's suggestion > (a > great contributor we had a while ago). > > Martin > > ------------------------------------------------------------------------- > This SF.net email is sponsored by DB2 Express > Download DB2 Express C - the FREE version of DB2 express and take > control of your XML. No limits. Just data. Click to get it now. > http://sourceforge.net/powerbar/db2/ > _______________________________________________ > Geotools-devel mailing list > Geotools-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/geotools-devel > ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Geotools-devel mailing list Geotools-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geotools-devel
