gnu.cvs.help
[Top] [All Lists]

Re: a couple of cvs problems....

Subject: Re: a couple of cvs problems....
From: Pierre Asselin
Date: Sun, 26 Mar 2006 01:04:58 +0000 UTC
Newsgroups: gnu.cvs.help
Martin J?rgensen <unoder.spam@xxxxxxxxxxxx> wrote:

> I copied a latex report-directory to somewhere else where I could make 
> changes and still be sure that I didn't accidentally did anything stupid...

Aside:  you copied files out of a CVS sandbox, where CVS was giving you
a nice safety net ?


> cvs -q update .
> [ ... ]
> cvs update: move away ./.cvsignore; it is in the way

Sombody else added and committed a .cvsignore file while you
weren't looking.  The .cvsignore file you copied to your
sandbox now conflicts with it.


> Apple:~/Desktop/bachelor2006/report mac$ cvs add .cvsignore
> cvs server: .cvsignore added independently by second party

Yep.  Somebody else beat you to it.

How to get out:
    mv .cvsignore my-new-cvsignore
    cvs update

The update will bring in the other guy's .cvsignore .  Look at
it and decide if it is better than your own.  If you decide
that no, you would rather replace it by your own file, just
do so.

    mv my-new-cvsignore .cvsignore
    cvs diff
    cvs commit


-- 
pa at panix dot com

<Prev in Thread] Current Thread [Next in Thread>