[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: Tue, 28 Feb 2006 20:55:09 +0100
User-agent: Mozilla Thunderbird 1.0.6 (Macintosh/20050716)

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

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.

Yeah, that's what it's telling me.

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

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.

I thought committing meant: Merge my work. And updating meant: Get changes since the last time and update all local files.

If I didn't delete this file report.log, how else could I manually fix the problem with merging? It's giving me some kind of list (diff I think) which I don't understand because I've never worked with diff before...

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]