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

Diff for /src/usr.bin/cvs/update.c between version 1.164 and 1.165

version 1.164, 2010/09/29 18:14:52 version 1.165, 2010/10/27 08:35:45
Line 580 
Line 580 
 void  void
 update_join_file(struct cvs_file *cf)  update_join_file(struct cvs_file *cf)
 {  {
         int flag;  
         time_t told;          time_t told;
         RCSNUM *rev1, *rev2;          RCSNUM *rev1, *rev2;
         const char *state1, *state2;          const char *state1, *state2;
Line 688 
Line 687 
                 goto out;                  goto out;
         }          }
   
         flag = rcs_kwexp_get(cf->file_rcs);          if (rcs_kwexp_get(cf->file_rcs) & RCS_KWEXP_NONE) {
         if (flag & RCS_KWEXP_NONE) {  
                 cvs_printf("non-mergable file: %s needs merge!\n",                  cvs_printf("non-mergable file: %s needs merge!\n",
                     cf->file_path);                      cf->file_path);
                 goto out;                  goto out;
Legend:
Removed from v.1.164  
changed lines
  Added in v.1.165