[cvsnt] BUG! conflicts not marked in CVS/Entries any more!

[Jerzy Kaczorowski]

> Were they ever?  I thought Wincvs just read the cvs output.

That would never do - what if command line was used from the DOS window or
something?

The Entries file format is actually documented in CVS manual along with
others:
http://www.cvshome.org/docs/manual/cvs_2.html#IDX40

If the first character is `/', then the format is:
  /name/revision/timestamp[+conflict]/options/tagdate

The conflict date can be used to find out whether the conflict was resolved,
which is what CvsIn is doing for example...

Best Regards,
Jerzy

----- Original Message -----
From: "Tony Hoyle" <tmh at nodomain.org>
Newsgroups: support.cvsnt
To: <cvsnt at cvsnt.org>
Sent: Friday, September 13, 2002 4:53 PM
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.
>
> Tony
>
> _______________________________________________
> cvsnt mailing list
> cvsnt at cvsnt.org
> http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt
>