diff options
Diffstat (limited to 'contrib/cvs/src')
| -rw-r--r-- | contrib/cvs/src/rcs.c | 6 | ||||
| -rw-r--r-- | contrib/cvs/src/update.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/cvs/src/rcs.c b/contrib/cvs/src/rcs.c index e87a3ae..dfdc71d 100644 --- a/contrib/cvs/src/rcs.c +++ b/contrib/cvs/src/rcs.c @@ -1857,9 +1857,9 @@ RCS_getdatebranch (rcs, date, branch) free (xbranch); if (p == vers->branches->list) { - /* FIXME: This case would seem to imply that the RCS file is - somehow invalid. Should we give an error message? */ - return (NULL); + /* This happens when you have a couple of branches off a revision, + and your branch has not diverged, but another has. */ + return (xstrdup (cur_rev)); } p = findnode (rcs->versions, p->key); diff --git a/contrib/cvs/src/update.c b/contrib/cvs/src/update.c index 8196c1f..def6a34 100644 --- a/contrib/cvs/src/update.c +++ b/contrib/cvs/src/update.c @@ -491,7 +491,7 @@ update_fileproc (callerdat, finfo) && tag != NULL && finfo->rcs != NULL) { - char *rev = RCS_getversion (finfo->rcs, tag, NULL, 1, NULL); + char *rev = RCS_getversion (finfo->rcs, tag, date, 1, NULL); if (rev != NULL && !RCS_nodeisbranch (finfo->rcs, tag)) nonbranch = 1; |
