raster layer properties and mask patches

Jonathan Coles jonathan at jpcoles.com
Wed Jan 26 14:32:33 CET 2005


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.

--jonathan

-- 
=====================================================================
 Jonathan Coles                               http://www.jpcoles.com
 jonathan at jpcoles.com                    GnuPG Key: /gpg_pub_key.asc
=====================================================================
-------------- next part --------------
A non-text attachment was scrubbed...
Name: baserenderer.py.patch
Type: text/x-patch
Size: 3199 bytes
Desc: not available
Url : http://www.intevation.de/pipermail/thuban-devel/attachments/20050126/659fe4a7/baserenderer.py.patch


More information about the Thuban-devel mailing list

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