raster layer properties and mask patches

Jan-Oliver Wagner jan at intevation.de
Wed Jan 26 15:08:12 CET 2005


On Wed, Jan 26, 2005 at 08:32:33AM -0500, Jonathan Coles wrote:
> Am Mittwoch, den 26.01.2005, 13:45 +0100 schrieb Jan-Oliver Wagner:
> > On Tue, Jan 25, 2005 at 07:54:13AM -0500, Jonathan Coles wrote:
> > > Am Dienstag, den 25.01.2005, 10:20 +0100 schrieb Jan-Oliver Wagner:
> > > > On Mon, Jan 24, 2005 at 06:04:45PM -0500, Jonathan Coles wrote:
> > > > > i've attached all the patches. there may seem to be a lot, but they
> > > > > really only cover the above two items.
> > > > 
> > > > the patch for baserenderer.py does not apply cleanly. Can you look
> > > > into this one?
> > > 
> > > i just did a clean cvs checkout and the patch applied fine. have you
> > > made modifications to your local copy?
> > 
> > $ cd Thuban/UI
> > $ rm baserenderer.py
> > $ cvs up
> > cvs server: Updating .
> > U baserenderer.py
> > M classifier.py
> > M mainwindow.py
> > $ patch -p2 < /tmp/baserenderer.py.patch
> > patching file baserenderer.py
> > Hunk #2 FAILED at 459.
> > Hunk #3 FAILED at 467.
> > Hunk #4 FAILED at 484.
> > 3 out of 4 hunks FAILED -- saving rejects to file baserenderer.py.rej
> > 
> > Can you double check you are in sync with CVS?
> 
> jpc at reisen:~/arbeit/intevation/devel5/thuban/Thuban/UI$ rm
> baserenderer.py 
> jpc at reisen:~/arbeit/intevation/devel5/thuban/Thuban/UI$ cvs up  
> cvs server: Updating .
> U baserenderer.py
> jpc at reisen:~/arbeit/intevation/devel5/thuban/Thuban/UI$ patch -p2
> < ../../baserenderer.py.patch 
> patching file baserenderer.py
> jpc at reisen:~/arbeit/intevation/devel5/thuban/Thuban/UI$
> 
> this is the same patch file that i sent before. i'll attach it again,
> just to make sure.

very strange.

Can you compare:

$ grep baserenderer.py CVS/Entries
/baserenderer.py/1.13/Wed Jan 26 14:04:59 2005//T1.13

and also send me the fully patched baserenderer.py 
as well as the native baserenderer.py you get from CVS?

	Jan
-- 
Jan-Oliver Wagner               http://intevation.de/~jan/

Intevation GmbH                      http://intevation.de/
FreeGIS                                http://freegis.org/




More information about the Thuban-devel mailing list

This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)