Hi,

In certain cases update -r and update -A would not properly set or reset
the sticky tag for file(s). This patch fixes that problem.

.joris

Index: update.c
===================================================================
RCS file: /cvs/src/usr.bin/cvs/update.c,v
retrieving revision 1.172
diff -u -p -r1.172 update.c
--- update.c    13 Oct 2016 20:51:25 -0000      1.172
+++ update.c    14 Oct 2016 14:13:11 -0000
@@ -480,10 +480,8 @@ cvs_update_local(struct cvs_file *cf)
                if (cvs_cmdop != CVS_OP_UPDATE)
                        break;
 
-               if (reset_tag != 1 && reset_option != 1)
-                       break;
-
-               if (cf->file_ent != NULL && cf->file_ent->ce_tag == NULL)
+               if (reset_tag != 1 && reset_option != 1 &&
+                   cvs_specified_tag == NULL && cvs_specified_date == -1)
                        break;
 
                if (cf->file_rcs->rf_dead != 1 &&

Reply via email to