[GEM-dev] Next week?

[IOhannes m zmoelnig]

James Tittle II wrote:

> 
> ...trying to commit, but can't!  What's this trying to tell me?
> 
> tiggity:~/puredataDev/Gem/src/Pixes tigital$ cvs commit -f -m "New 
> version of YUV luma, which is more sensitive" pix_halftone.cpp
> cvs commit: Up-to-date check failed for `pix_halftone.cpp'
> cvs [commit aborted]: correct above errors first!
> 
> ...there are many conflicts with the "latest" version, but that's 
> because I've gone back to looking at yuv luma two at a time, among other 
> things...how do I get around this?
> 

my (not very sensible) solution for this kind of problems is normally:
a) copy my "original" file to somewhere else
b) delete the original file
c) cvs up (getting the newest version)
d) look at the differences (optional ;-))
e) replace the new file with my old one
f) cvs ci


mfg.as.dr
IOhannes