Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl2/xcvs/dist/src Always pass the modification tim...



details:   https://anonhg.NetBSD.org/src/rev/a3503be4d58a
branches:  trunk
changeset: 819832:a3503be4d58a
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Dec 19 03:15:31 2016 +0000

description:
Always pass the modification time of the file to the client and let it decide
if it is going to use it to set the time. This makes update work like checkout
with respect to time setting. The time of the updated file is set to the
repository modification time of the file as opposed to the the time that the
file was checked out.

diffstat:

 external/gpl2/xcvs/dist/src/update.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 827636cf219a -r a3503be4d58a external/gpl2/xcvs/dist/src/update.c
--- a/external/gpl2/xcvs/dist/src/update.c      Mon Dec 19 03:07:05 2016 +0000
+++ b/external/gpl2/xcvs/dist/src/update.c      Mon Dec 19 03:15:31 2016 +0000
@@ -38,7 +38,7 @@
  * as well.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: update.c,v 1.5 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: update.c,v 1.6 2016/12/19 03:15:31 christos Exp $");
 
 #include "cvs.h"
 #include <assert.h>
@@ -1366,12 +1366,16 @@
            /* set the time from the RCS file iff it was unknown before */
            set_time =
                (!noexec
+#if 0
+               /*
+                * always pass the time to the client, and let it decide
+                * if it is going to set the time
+                */
                 && (vers_ts->vn_user == NULL ||
                     strncmp (vers_ts->ts_rcs, "Initial", 7) == 0)
+#endif
                 && !file_is_dead);
-
            wrap_fromcvs_process_file (finfo->file);
-
            xvers_ts = Version_TS (finfo, options, tag, date, 
                                   force_tag_match, set_time);
            if (strcmp (xvers_ts->options, "-V4") == 0)
@@ -1768,7 +1772,7 @@
         /* 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, 0);
+                              force_tag_match, 1);
        if (strcmp (xvers_ts->options, "-V4") == 0)
            xvers_ts->options[0] = '\0';
 



Home | Main Index | Thread Index | Old Index