summaryrefslogtreecommitdiffstats
path: root/contrib/cvs/src/no_diff.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/cvs/src/no_diff.c')
-rw-r--r--contrib/cvs/src/no_diff.c7
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
OpenPOWER on IntegriCloud