[clug] CVS pain

[Michael Still]

I have a fairly simple cvs setup:

A CVS server in the sky. There is a checkout of a module to my laptop,
where I did not edits. I then scp'ed that to my research box.

...Much updating to stuff to do with things later...

Now I'm trying to commit the changes from the research box, and getting
the error:

cvs [commit aborted]: could not find desired version 1.5 in
/srv/stillhq.com/www/html/cvs/phd/compression/doco.tex,v

Does anyone have any idea what this actually _means_? It's starting to
get kinda annoying.

(Suggestions for other source control systems will be entertained, if:
    - I can checkin these changes first
    - My source history going back five years isn't lost in the upgrade
    - There is an equivalent to cvsweb
    - Bonus points for solutions which don't break my current cvsweb
      URLs)

Thanks,
Mikal

-- 

Michael Still (mikal at stillhq.com) | "The geek shall inherit
http://www.stillhq.com            |  the earth"
UTC + 10                          |    -- The Simpsons