diff options
author | peter <peter@FreeBSD.org> | 1998-03-10 13:40:57 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1998-03-10 13:40:57 +0000 |
commit | 0c111e2b51cac7eead56494b30c5977e4ec9a8ea (patch) | |
tree | f60b0014663435c30f2efea2b10ca4f8ecc0208c /contrib/cvs/src/no_diff.c | |
parent | c3a8ee0e80a59793349940056dfd14746ebd4905 (diff) | |
download | FreeBSD-src-0c111e2b51cac7eead56494b30c5977e4ec9a8ea.zip FreeBSD-src-0c111e2b51cac7eead56494b30c5977e4ec9a8ea.tar.gz |
Import cvs-1.9.26 onto vendor branch
Diffstat (limited to 'contrib/cvs/src/no_diff.c')
-rw-r--r-- | contrib/cvs/src/no_diff.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/contrib/cvs/src/no_diff.c b/contrib/cvs/src/no_diff.c index 6d6a6fb..078343e 100644 --- a/contrib/cvs/src/no_diff.c +++ b/contrib/cvs/src/no_diff.c @@ -36,6 +36,13 @@ No_Difference (finfo, vers) if (!vers->srcfile || !vers->srcfile->path) return (-1); /* different since we couldn't tell */ +#ifdef PRESERVE_PERMISSIONS_SUPPORT + /* If special files are in use, then any mismatch of file metadata + information also means that the files should be considered different. */ + if (preserve_perms && special_file_mismatch (finfo, vers->vn_user, NULL)) + return 1; +#endif + if (vers->entdata && vers->entdata->options) options = xstrdup (vers->entdata->options); else |