[Top][All Lists]

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

"Results of Merge" persistent (false) conflict

From: Robert Bresner
Subject: "Results of Merge" persistent (false) conflict
Date: Thu, 09 Nov 2000 14:10:39 -0600

Howdy --

I've had a persistent and occasional problem for a few years now
that happens just rarely enough that I don't care. Then someone
who does care comes along, and here I am.

CVS client/server 1.10.8
client: WinNT
server: Solaris something or other. (2.5/2.6 or 7/8 depends who I ask)

What happens is I'll do an update on a locally 
modified file on my client and a conflict occurs. 
I fix the conflict then I
        cvs update foo.c
and I expect the conflict to be resolved and the 
file ready for check-in. (In fact, according to 
the output of update, the file is 'M': locally modified.
So I'll try to check in.

No such luck. The merge conflict persists.
So, I have to manually modify the CVS/Entries 
file, which has "Results of Merge" in the timestamp
field of the file. Once that's removed, the file
is accepted as locally modified. 

This is, of course, dangerous. Since I'm sure one 
day I'll miss a conflict in the file, and check in
something which still has a conflict. 

Why does this happen, and how can I make it stop?

Thanks in advance


reply via email to

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