[cvsnt] BUG! conflicts not marked in CVS/Entries any more!
Bo.Berglund at system3r.se
Fri Sep 13 10:21:03 BST 2002
I have noted strange behaviour too recently.
A few examples:
Update a sandbox. The command window reports that there were merges etc.
Reports conflict on one or two text files
Also reports that nonmergeable file xxx.exe is replaced by new revision and old is renamed
After finish WinCvs displays the exe file as red (committable) as well as the conflict files.
I make another update just to be sure and now the exe icon turns white.
The conflict files are still red (without the 'C' in the icon) and they can be committed.
Problem now is that they contain the conflict markers nonetheless and the compiler barfs at them.
I thought that this was a WinCvs issue but now I don't know anymore since cvs itself updates the
Entries files. I am using CVSNT 57g as cvs.exe for WinCvs
From: Tony Hoyle [mailto:tmh at nodomain.org]
Sent: den 13 september 2002 10:54
To: cvsnt at cvsnt.org
Subject: Re: [cvsnt] BUG! conflicts not marked in CVS/Entries any more!
On Fri, 13 Sep 2002 09:17:00 +0200, Richard Wirth wrote:
> Hello Tony,
> there is definitively a bug in the current build.
> Conflicts are no longer marked in the CVS/Entries !
Were they ever? I thought Wincvs just read the cvs output.
>> /* RW -->> */
>> ts = strchr( ts, '+');
>> if( NULL == ts)
>> ts = "";
>> /* -->> RW */
That looks like it'll break tags etc. to me. I'll see if I can
reproduce the bug.
cvsnt mailing list
cvsnt at cvsnt.org
More information about the cvsnt