/[cvs]/ccvs/src/checkin.c
ViewVC logotype

Diff of /ccvs/src/checkin.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.55.6.3 by dprice, Wed Nov 23 01:46:53 2005 UTC revision 1.55.6.4 by dprice, Tue Nov 29 23:44:18 2005 UTC
# Line 103  Checkin (int type, struct file_info *fin Line 103  Checkin (int type, struct file_info *fin
103                  /* The existing file is incorrect.  We need to check                  /* The existing file is incorrect.  We need to check
104                     out the correct file contents.  */                     out the correct file contents.  */
105                  if (base_checkout (finfo->rcs, finfo, pvers->vn_user,                  if (base_checkout (finfo->rcs, finfo, pvers->vn_user,
106                                     vers->vn_rcs, NULL, options,                                     vers->vn_rcs, NULL, options))
                                   cvswrite  
                                   || fileattr_get (finfo->file, "_watched")))  
107                      error (1, 0, "failed when checking out new copy of %s",                      error (1, 0, "failed when checking out new copy of %s",
108                             finfo->fullname);                             finfo->fullname);
109                  base_copy (finfo, vers->vn_rcs, "y");                  base_copy (finfo, vers->vn_rcs,
110                               cvswrite && !fileattr_get (finfo->file, "_watched")
111                               ? "yy" : "yn");
112                  set_time = 1;                  set_time = 1;
113              }              }
114    
# Line 176  Checkin (int type, struct file_info *fin Line 176  Checkin (int type, struct file_info *fin
176          if (set_time)          if (set_time)
177              /* Need to update the checked out file on the client side.  */              /* Need to update the checked out file on the client side.  */
178              server_updated (finfo, vers, SERVER_UPDATED,              server_updated (finfo, vers, SERVER_UPDATED,
179                              (mode_t) -1, NULL, NULL, true);                              (mode_t) -1, NULL, NULL);
180          else          else
181              server_checked_in (finfo->file, finfo->update_dir,              server_checked_in (finfo->file, finfo->update_dir,
182                                 finfo->repository);                                 finfo->repository);

Legend:
Removed from v.1.55.6.3  
changed lines
  Added in v.1.55.6.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26