[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: cvs update

From: Martin Jørgensen
Subject: Re: cvs update
Date: Sun, 26 Feb 2006 13:57:13 +0100
User-agent: Mozilla Thunderbird 1.0.6 (Macintosh/20050716)

Pierre Asselin wrote:
Martin J?rgensen <address@hidden> wrote:
so I didn't understood what happened "behind the interface". Now I want to learn some of the command line parameters and discovered that if I type "cvs update" then cvs doesn't necessarily get changes from the repository and overwrites my files in the current directory...

Yes it does.  "cvs update" pulls in the changes committed by others
while you weren't looking and folds them into your local copies.

You're saying it's overwriting my local files. But then explain to me this message:

$ cvs -q update -dP bachelor2006
U bachelor2006/report/report.lof
RCS file: /usr/local/cvs/s022826/bachelor2006/report/report.log,v
retrieving revision 1.2
retrieving revision 1.3
Merging differences between 1.2 and 1.3 into report.log
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in bachelor2006/report/report.log
C bachelor2006/report/report.log

What is it trying to do? I just want it to *overwrite* my local files instead of this garbage behaviour...

It should not "merge" any differences, whatever it means by that.... So, what am I missing?

If no changes have been committed since you last updated, nothing
happens.  Your modified files (red icons) still show up as modified
and your unmodified (green icons) files still show up as unmodified.

Please don't talk about red and green icons and tortoisecvs. Forget I even talked about tortoisecvs but seen from a (bash-shell) command-line perspective I would like to know what is happening...

Best regards / Med venlig hilsen
Martin Jørgensen

Home of Martin Jørgensen -

reply via email to

[Prev in Thread] Current Thread [Next in Thread]