Op Fri, 30 Dec 2005 17:01:46 +1030 schreef Clytie Siddall <clytie riverland net au>: > Hi guys :) > > I'm getting quite a few out-of-date errors from CVS while updating > HEAD files. > > The odd thing about these errors is: > > 1. I download my file from the latest status page, so > 2. there isn't a later file available from the status page and > 3. usually the CVS file is older, not newer > > Example: gnomemeeting, which I've just tried to commit > ____ > <<<<<<< vi.po > "POT-Creation-Date: 2005-12-29 22:49+0100\n" > "PO-Revision-Date: 2005-12-30 16:46+1030\n" > ======= > "POT-Creation-Date: 2005-06-23 05:04+0000\n" > "PO-Revision-Date: 2005-06-24 18:32+0930\n" > >>>>>>> 1.10 > ____ > > vi.po is my current file. > > How do I commit my files? I don't exactly understand your problem here. I've never gotten an out-of-date error. But here's how I commit: 1. cvs checkout (or update) $module/po 2. replace vi.po file with your own file, which you downloaded from the statuspages, and update ChangeLog file. 3. cvs chommit. Kind regards, Vincent van Adrighem
Attachment:
pgp9f8zqfE0IN.pgp
Description: PGP signature