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 | a194b78bd292dd13f17cfe65c12fb5dee1bb9392 (patch) | |
| tree | 83716acb7a6188c846ca3328958e0a93b9701795 /contrib/cvs/src/classify.c | |
| parent | 39cd03a57045ca27b0e7323a52f287f7696fa947 (diff) | |
| parent | 0c111e2b51cac7eead56494b30c5977e4ec9a8ea (diff) | |
| download | FreeBSD-src-a194b78bd292dd13f17cfe65c12fb5dee1bb9392.zip FreeBSD-src-a194b78bd292dd13f17cfe65c12fb5dee1bb9392.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r34461,
which included commits to RCS files with non-trunk default branches.
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)) |
