Sounds good frank, I expect you will run into a bit of merge conflict pain, I 
will be on IRC if needed. 

-- 
Jody Garnett


On Tuesday, 26 March 2013 at 9:31 PM, Frank Gasdorf wrote:

> Jody, fixed the history and try to build before pushing to origin again. I 
> followed  http://clock.co.uk/tech-blogs/deleting-a-git-commit and right now I 
> have the complete history since 
> https://github.com/uDig/udig-platform/commit/895290df5d609c3ba056169ff667a77c1791956e
>  fixed. I will send a mail, if I've pushed it ..
> Frank
> 
> 
> 
> 2013/3/26 Frank Gasdorf <fg...@users.sourceforge.net 
> (mailto:fg...@users.sourceforge.net)>
> > So we need to remove the following commits : 
> > cbd19c745aafa2e87cfc0b0fbb72ff3b9a88a6aa...e688dffbe56fba93b755f8f820901f9d0289e1a7
> > 
> > Any idea how get git doing this?
> > 
> > 
> > 2013/3/26 Jody Garnett <jody.garn...@gmail.com 
> > (mailto:jody.garn...@gmail.com)>
> > > Some work got reverted including an important fix:
> > > 
> > > deploy/udig.html <-- I wondered where that went!
> > > 
> > > docs/*
> > > 
> > > plugins/eu.udig.omsbox/src/eu/udig/omsbox/OmsBoxPlugin.java 
> > > plugins/eu.udig.omsbox/src/eu/udig/omsbox/core/OmsScriptExecutor.java
> > > plugins/net.refractions.udig.catalog.db2/META-INF/MANIFEST.MF
> > > ...actions.udig.catalog.geotiff/src/net/refractions/udig/catalog/internal/geotiff/GeoTiffServiceExtension.java
> > > plugins/net.refractions.udig.catalog.rasterings/META-INF/MANIFEST.MF
> > > plugins/net.refractions.udig.catalog.ui/plugin.properties
> > > plugins/net.refractions.udig.catalog/src/net/refractions/udig/catalog/internal/ServiceFactoryImpl.java
> > > 
> > > 
> > > plugins/net.refractions.udig.help/EN/*
> > > 
> > > plugins/net.refractions.udig.legend/META-INF/MANIFEST.MF
> > > plugins/net.refractions.udig.libs/META-INF/MANIFEST.MF
> > > plugins/net.refractions.udig.project.ui/src/net/refractions/udig/project/ui/internal/actions/Delete.java
> > > plugins/net.refractions.udig.project/src/net/refractions/udig/project/internal/ProjectPlugin.java
> > > plugins/net.refractions.udig.project/src/net/refractions/udig/project/internal/impl/ProjectRegistryImpl.java
> > > plugins/net.refractions.udig.ui/src/net/refractions/udig/ui/graphics/AWTSWTImageUtils.java
> > > plugins/net.refractions.udig/about.mappings
> > > 
> > > 
> > > Available from here (very long):
> > > 
> > > https://github.com/uDig/udig-platform/commit/76555f58fb7a94525a4c73e808431b29d186b9bc
> > >  
> > > 
> > > Frank I have added common.pyc to the list of files "clean" removes, this 
> > > will prevent the large diffs I change common.py, and python does not know 
> > > to update common.pyc.
> > > 
> > > -- 
> > > Jody Garnett
> > > 
> > > 
> > > _______________________________________________
> > > User-friendly Desktop Internet GIS (uDig)
> > > http://udig.refractions.net
> > > http://lists.refractions.net/mailman/listinfo/udig-devel
> > > 
> > 
> 
> _______________________________________________
> User-friendly Desktop Internet GIS (uDig)
> http://udig.refractions.net
> http://lists.refractions.net/mailman/listinfo/udig-devel
> 
> 


_______________________________________________
User-friendly Desktop Internet GIS (uDig)
http://udig.refractions.net
http://lists.refractions.net/mailman/listinfo/udig-devel

Reply via email to