Hi Lachele,
If it's conflicting, that means that CVS does recognise the file as belonging to the repository, but that somehow it's gotten confused about when, and how, it was last changed on your machine vs the repo.
A page here (
http://osdir.com/ml/version-control.cvs.tortoisecvs.user/2004-04/msg00070.html) suggests that the problem could stem from the files in each directory's "CVS" subdirectory - especially the Entries file. I'm not sure what could have happened to cause that. Are you using a CVS client other than command-line cvs?
Ben
On 23/2/2010, at 9:53 a.m., Lachele Foley wrote:
> I know you're all busy; sorry to trouble you. If you know off the top of your head how to fix this, please say. Otherwise, I'll deal with it. Every time I try to update a cvs tree, I get, for every file, something like this:
>
> cvs checkout: move away amber11/benchmarks/nab/gact3.mc.x; it is in the way
> C amber11/benchmarks/nab/gact3.mc.x
>
> Word in Google-space says that the issue is that cvs doesn't recognize those files as belonging to the repo. But, I didn't change them.
>
> A thought just now: could it be a weird selinux thing? I'll try updating to a machine without selinux and see what happens. In the mean time, I can just check out the repo new each time like I always have.
--
Dr. Benjamin P. Roberts
Postdoctoral Research Associate
Quantum Theory Project
University of Florida
2301 New Physics Building #92
PO Box 118435
Gainesville FL 32611-8435
USA
Phone: +1 352 392 6712
Cell: +1 352 222 3677
Member of the American Chemical Society
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Tue Feb 23 2010 - 07:30:02 PST
