summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2008-06-06 16:16:44 +0000
committerobrien <obrien@FreeBSD.org>2008-06-06 16:16:44 +0000
commit9b68850f895ae0853b2f24a20dd21f899e1be705 (patch)
tree5b31121173b49efccc3f423fe26186989c3519d9 /contrib
parent8f43dc038348807a2ca82e7bd5e6f498f69356f5 (diff)
downloadFreeBSD-src-9b68850f895ae0853b2f24a20dd21f899e1be705.zip
FreeBSD-src-9b68850f895ae0853b2f24a20dd21f899e1be705.tar.gz
Optimize the CVS bug #17168 fix by relaxing the conditions for update
with respect to sticky options. (r179561 was WRT sticky and branch tags) Consulted with: Mark Baushke <mdb@gnu.org>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/cvs/src/classify.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/cvs/src/classify.c b/contrib/cvs/src/classify.c
index 0ec8d4e..bae2a9b 100644
--- a/contrib/cvs/src/classify.c
+++ b/contrib/cvs/src/classify.c
@@ -41,6 +41,7 @@ keywords_may_change (aflag, vers)
* changed by -A...
*/
|| (strlen (vers->entdata->options)
+ && strcmp (vers->entdata->options, vers->options)
&& strcmp (vers->entdata->options, "-kkv")
&& strcmp (vers->entdata->options, "-kb"))))
/* ...or... */
OpenPOWER on IntegriCloud