From dc7a20515e038a2cfc69fa85c6dee7fd073fdb70 Mon Sep 17 00:00:00 2001 From: christos Date: Wed, 4 Jan 2017 16:11:20 +0000 Subject: [PATCH] only preserve timestamps on specific revisions if we've been asked to. found by martin@ --- external/gpl2/xcvs/dist/src/update.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/external/gpl2/xcvs/dist/src/update.c b/external/gpl2/xcvs/dist/src/update.c index 9bbf794e451b..11906b69cb01 100644 --- a/external/gpl2/xcvs/dist/src/update.c +++ b/external/gpl2/xcvs/dist/src/update.c @@ -38,7 +38,7 @@ * as well. */ #include -__RCSID("$NetBSD: update.c,v 1.10 2016/12/19 17:31:47 christos Exp $"); +__RCSID("$NetBSD: update.c,v 1.11 2017/01/04 16:11:20 christos Exp $"); #include "cvs.h" #include @@ -1382,7 +1382,6 @@ VERS: ", 0); xvers_ts = Version_TS (finfo, options, tag, date, force_tag_match, set_time); - if (strcmp (xvers_ts->options, "-V4") == 0) xvers_ts->options[0] = '\0'; @@ -1777,7 +1776,7 @@ patch_file (struct file_info *finfo, Vers_TS *vers_ts, int *docheckout, /* This stuff is just copied blindly from checkout_file. I don't really know what it does. */ xvers_ts = Version_TS (finfo, options, tag, date, - force_tag_match, 1); + force_tag_match, preserve_timestamps_on_update); if (strcmp (xvers_ts->options, "-V4") == 0) xvers_ts->options[0] = '\0';