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

Re: a couple of cvs problems....

Subject: Re: a couple of cvs problems....
From: Martin Jørgensen
Date: Sun, 26 Mar 2006 16:06:42 +0200
Newsgroups: gnu.cvs.help
Pierre Asselin wrote:
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 ?

Exactly... I do it quite often because it's faster for me to delete the "working directory" and copy it back than to do an update -dP command again...

Deleting + copying back = about 5-10 seconds.
cvs update -dP = about 30 seconds.

Do you have a better idea?

On this project there are no other working on it than me, so nobody can commit anything...

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.

But why doesn't it write:

C .cvsignore

Like it used to do, when updating to tell that there's a conflict here???

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

Oh... I never used cvs diff... Must try it out...


Best regards / Med venlig hilsen
Martin Jørgensen

--
---------------------------------------------------------------------------
Home of Martin Jørgensen - http://www.martinjoergensen.dk

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