Hi, I'm working on several machines on the same project. One of them is my home machine, which does not have access to the CVS server. That means I regularly zip (or tar) all the relevant files, work on them at home, unzip the new files at work, and then want to synchronise the archive. This usually works, except when e.g. I unzipped the new files on 2 'work machines', and then synchronised the CVS archive on one of them. On the other I then get this type of conflict:
$ cvs status VC/IO.dsp cvs server: move away VC/IO.dsp; it is in the way =================================================================== File: IO.dsp Status: Unresolved Conflict Working revision: No entry for IO.dsp Repository revision: 1.1 /usr/local/cvsroot/parapet/PPhead/IO/VC/IO.dsp,v same happens with edited files (not only new ones), although I then get the changes usually flagged as conflicts. Of course, I totally agree with what CVS is trying to tell me and I guess clean working practices should solve my problem (although that's maybe a bit hard to do as I don't necessarily want to put my recent changes in the archive yet, but want to have all machines synchronised). However, I wonder if there's a way to force CVS to go ahead anyway whenever it gives the 'move away' message. Now I have to delete the file by hand and then call cvs update again. I'd rather pass a flag to cvs... Any suggestions? Kris Thielemans (kris.thielemans <at> ic.ac.uk) Imaging Research Solutions Ltd Cyclotron Building Hammersmith Hospital Du Cane Road London W12 ONN, United Kingdom web site address: http://www.irsl.org/~kris _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
