Hi.
Updated diff below.
.joris
Index: entries.c
===
RCS file: /cvs/src/usr.bin/cvs/entries.c,v
retrieving revision 1.103
diff -u -p -r1.103 entries.c
--- entries.c 16 Jan 2015 06:40:07 - 1.103
+++ entries.c 15 Feb 2015
On Thu, Feb 12, 2015 at 11:30:26PM +0100, Stefan Sperling wrote:
> This looks right for non-conflicted files.
>
> But for conflicted files, the version of GNU cvs we have in base,
> and opencvs without this patch, both show:
>
>Working revision:1.18Result of merge
>
> With this patch
On Thu, Feb 12, 2015 at 09:16:30PM +0100, Joris Vink wrote:
> Opencvs showed the incorrect time for status.
>
> Changed it to do what GNU does which is taking the
> actual time string from the entries line.
> (not on the list, cc me)
>
> .joris
>
> Index: cvs.h
>
Opencvs showed the incorrect time for status.
Changed it to do what GNU does which is taking the
actual time string from the entries line.
(not on the list, cc me)
.joris
Index: cvs.h
===
RCS file: /cvs/src/usr.bin/cvs/cvs.h,v
retr