OSEC

Neohapsis is currently accepting applications for employment. For more information, please visit our website www.neohapsis.com or email hr@neohapsis.com
CVS: cvs.openbsd.org: src

From: Joris Vink (joriscvs.openbsd.org)
Date: Sat Mar 01 2008 - 08:55:03 CST


CVSROOT: /cvs
Module name: src
Changes by: joriscvs.openbsd.org 2008/03/01 07:55:03

Modified files:
        usr.bin/cvs : file.c

Log message:
make sure we compare our current file contents against the correct
revision specified in CVS/Entries if the timestamps mismatch, so
that we do not end up merging a file that was not even modified whenever
it needs a normal patch.