[Top][All Lists]

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

conflict resolution and update

From: Bernd Kuemmerlen
Subject: conflict resolution and update
Date: Wed, 14 Aug 2002 10:38:28 +0200

Hello there,

I have searched the mailing list archives and the docs, but found nothing
relating to a problem I have concerning conflict resolution. But maybe I
am just missing something.

This is for a remote cvs setup (rsh, ssh or pserver, cvs 1.11.1p1).
Whenever a conflict is detected during update, two things happen: "cvs
update" reports "C filename" for the file and the conflict marker "Result
of merge" is put into the CVS/Entries file before the timestamp.
After having resolved the conflict (i.e. touching the file), "cvs -nq
update" (correctly) reports "M filename" i.e. locally modified, but "cvs
status" still reports "Status: File had conflicts on merge". The "cvs
status" output seems to be directly related to the CVS/Entries file,
because if I remove the "Result of merge" there, "cvs status" correctly
reports "Locally modified".

The problem is, that a GUI cvs frontend we use (CVL,
<http://www.sente.ch/software/cvl/>) relies on the output of "cvs status"
for the display of conflicts.

It seems that the behaviour of cvs here is a bit inconsistent: "cvs -nq
update" relies only on the modification date of the file whereas "cvs
status" seems to parse CVS/Entries. I would think that at least the
"Result of merge" would be removed from this file after the next "cvs
update", but it stays there until the next commit...

Any thoughts on this issues?

Thanks for any help.
"Programming today is a race between software engineers striving to
build bigger and better idiot-proof programs, and the Universe trying to
produce bigger and better idiots. So far, the Universe is winning."
                                                      -- Rich Cook

reply via email to

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