diff options
| author | peter <peter@FreeBSD.org> | 1997-06-22 10:55:49 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-06-22 10:55:49 +0000 |
| commit | 571cfa0005d94d99d1341bf8ab02be04d4df5f9f (patch) | |
| tree | 8684660dbfd105deed9a44c9e97d4f56b231fac1 /contrib/cvs/src/patch.c | |
| parent | fc35590c6dddf32e1fa855b541dc28a23965f90c (diff) | |
| download | FreeBSD-src-571cfa0005d94d99d1341bf8ab02be04d4df5f9f.zip FreeBSD-src-571cfa0005d94d99d1341bf8ab02be04d4df5f9f.tar.gz | |
Import cvs-1.9.10
Diffstat (limited to 'contrib/cvs/src/patch.c')
| -rw-r--r-- | contrib/cvs/src/patch.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/cvs/src/patch.c b/contrib/cvs/src/patch.c index 1cf8397..194999b 100644 --- a/contrib/cvs/src/patch.c +++ b/contrib/cvs/src/patch.c @@ -514,7 +514,9 @@ patch_fileproc (callerdat, finfo) memset ((char *) &t, 0, sizeof (t)); if ((t.actime = t.modtime = RCS_getrevtime (rcsfile, vers_tag, (char *) 0, 0)) != -1) - (void) utime (tmpfile1, &t); + /* I believe this timestamp only affects the dates in our diffs, + and therefore should be on the server, not the client. */ + (void) utime (tmpfile1, &t); } else if (toptwo_diffs) { @@ -536,7 +538,9 @@ patch_fileproc (callerdat, finfo) } if ((t.actime = t.modtime = RCS_getrevtime (rcsfile, vers_head, (char *) 0, 0)) != -1) - (void) utime (tmpfile2, &t); + /* I believe this timestamp only affects the dates in our diffs, + and therefore should be on the server, not the client. */ + (void) utime (tmpfile2, &t); } run_setup ("%s -%c", DIFF, unidiff ? 'u' : 'c'); run_arg (tmpfile1); |
