Re: cvs update

[Pierre Asselin]

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 ...

> rcsmerge: warning: conflicts during merge
> cvs server: conflicts found in bachelor2006/report/report.log
> C bachelor2006/report/report.log

... and failed.  Your copy of report.log needs to be fixed by hand.


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

In that case, try the commands

    $ rm bachelor2006/report/report.log
    $ cvs -q update -dP bachelor2006

This will give you a warning that the file was lost (indeed,
you just removed it) and bring in a fresh revision 1.3 from the
repository.


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

Only that cvs likes to merge.  Merging your work in progress with the
work done by others is the default mode of operation.  Throwing away
your tentative changes takes an intervention on your part.


> 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...

Gladly.  The command line is more powerful anyway.


-- 
pa at panix dot com