[BACK]Return to tag.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / cvs

Diff for /src/usr.bin/cvs/tag.c between version 1.30 and 1.31

version 1.30, 2005/08/08 11:40:07 version 1.31, 2005/09/26 17:43:48
Line 143 
Line 143 
                 return (CVS_EX_BADTAG);                  return (CVS_EX_BADTAG);
         }          }
   
         if (tag_branch && tag_delete) {          if ((tag_branch == 1) && (tag_delete == 1)) {
                 cvs_log(LP_WARN, "ignoring -b with -d options");                  cvs_log(LP_WARN, "ignoring -b with -d options");
                 tag_branch = 0;                  tag_branch = 0;
         }          }
   
         if (tag_delete && tag_oldname)          if ((tag_delete == 1) && (tag_oldname != NULL))
                 tag_oldname = NULL;                  tag_oldname = NULL;
   
         if (tag_delete && tag_date)          if ((tag_delete == 1) && (tag_date != NULL))
                 tag_date = NULL;                  tag_date = NULL;
   
         if (tag_oldname != NULL && tag_date != NULL) {          if ((tag_oldname != NULL) && (tag_date != NULL)) {
                 cvs_log(LP_ERR, "the -D and -r options are mutually exclusive");                  cvs_log(LP_ERR, "the -D and -r options are mutually exclusive");
                 return (CVS_EX_USAGE);                  return (CVS_EX_USAGE);
         }          }
Legend:
Removed from v.1.30  
changed lines
  Added in v.1.31