diff options
Diffstat (limited to 'contrib/cvs/src/classify.c')
| -rw-r--r-- | contrib/cvs/src/classify.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/cvs/src/classify.c b/contrib/cvs/src/classify.c index 57c23cd..b33c945 100644 --- a/contrib/cvs/src/classify.c +++ b/contrib/cvs/src/classify.c @@ -302,6 +302,8 @@ conflict: %s created independently by second party", * has changed. If the sticky tag has changed, we just need * to re-register the entry */ + /* TODO: decide whether we need to check file permissions + for a mismatch, and return T_CONFLICT if so. */ if (vers->entdata->options && strcmp (vers->entdata->options, vers->options) != 0) ret = T_CHECKOUT; @@ -377,7 +379,7 @@ conflict: %s created independently by second party", * The user file is still unmodified, so just get it as well */ #ifdef SERVER_SUPPORT - if (strcmp (vers->entdata->options ? + if (strcmp (vers->entdata->options ? vers->entdata->options : "", vers->options) != 0 || (vers->srcfile != NULL && (vers->srcfile->flags & INATTIC) != 0)) |
