Re: conflict resolution and update

[Derek Robert Price]

Bernd Kuemmerlen wrote:

> Hello there,
>
> since I have posted this in August last year and I have never heard 
> any response (and I am still not able to file an "Issue" at 
> cvshome.org), I am posting this again:


To be able to file an "isuse" on cvshome.org, request an "Observer" role 
in the "ccvs" project.  I grant all of them, but sometime it takes a few 
days.

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


This sounds like a bug in the `cvs status' command.  I'm testing a fix now.

Derek

--
               *8^)

Email: derek@ximbiot.com

Get CVS support at <http://ximbiot.com>!
--
When you find yourself getting irritated with someone, try to remember
that all men are brothers...  a noogie or an Indian burn should do the
trick.