[Cvs-cvs] Changes to ccvs/src/commit.c [signed-commits2]

[Derek Robert Price]

Index: ccvs/src/commit.c
diff -u ccvs/src/commit.c:1.255.4.1 ccvs/src/commit.c:1.255.4.2
--- ccvs/src/commit.c:1.255.4.1 Thu Oct 20 21:33:10 2005
+++ ccvs/src/commit.c   Sat Oct 29 04:34:57 2005
@@ -24,6 +24,7 @@
 #include "edit.h"
 #include "fileattr.h"
 #include "hardlink.h"
+#include "sign.h"
 
 static Dtype check_direntproc (void *callerdat, const char *dir,
                                const char *repos, const char *update_dir,
@@ -920,6 +921,22 @@
                error (0, 0,
                       "\
 warning: file `%s' seems to still contain conflict indicators",
+                      finfo->fullname);
+           }
+
+           if ((status == T_ADDED || status == T_MODIFIED)
+               && !force_ci && !really_quiet
+               /* This will not be called from the client.  */
+               && (get_sign_commits (server_active, true)
+                   || have_sigfile (server_active, finfo->file))
+               && file_contains_keyword (finfo))
+           {
+               /* Make this a warning, not an error, because the user may
+                * be intentionally signing a file with keywords.  Such a file
+                * may still be verified when checked out -ko.
+                */
+               error (0, 0,
+"warning: signed file `%s' contains at least one RCS keyword",
                       finfo->fullname);
            }