Re: cvs update

[Sergei Organov]

Martin Jørgensen <address@hidden> writes:

> Pierre Asselin wrote:
>> Martin J?rgensen <address@hidden> wrote:
>>
>>> 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
>> You had a copy of report.log revision 1.2 and you made changes.
>> Someone else made changes to the same file and committed them,
>> as revision 1.3 .  Your update attempted to create a local copy
>> with both sets of changes ...
>
> Actually I'm the only user on that project, but I'm working on several
> machines... report.log is a file which is not important. I don't care
> about that file (generated by latex).

Then why did you put it under the CVS control in the first place?!

Overall, my advice is to move report.log out of CVS control:

$ rm report.log
$ cvs remove report.log
$ echo "report.log" >> .cvsignore
$ cvs ci -m"Removed report.log" report.log .cvsignore

-- Sergei.