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

Diff of /ccvs/src/classify.c

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

revision 1.35 by dprice, Thu Sep 22 05:43:46 2005 UTC revision 1.36 by dprice, Fri Sep 23 03:19:22 2005 UTC
# Line 284  Classify_File (struct file_info *finfo, Line 284  Classify_File (struct file_info *finfo,
284                          error (0, 0, "warning: `%s' was lost", finfo->fullname);                          error (0, 0, "warning: `%s' was lost", finfo->fullname);
285                  ret = T_CHECKOUT;                  ret = T_CHECKOUT;
286              }              }
287              else if (strcmp (vers->ts_user, vers->ts_rcs) == 0)              else if (!strcmp (vers->ts_user,
288                                  vers->ts_conflict
289                                  ? vers->ts_conflict : vers->ts_rcs))
290              {              {
291    
292                  /*                  /*
# Line 298  Classify_File (struct file_info *finfo, Line 300  Classify_File (struct file_info *finfo,
300                  if (vers->entdata->options &&                  if (vers->entdata->options &&
301                      strcmp (vers->entdata->options, vers->options) != 0)                      strcmp (vers->entdata->options, vers->options) != 0)
302                      ret = T_CHECKOUT;                      ret = T_CHECKOUT;
303                    else if (vers->ts_conflict)
304                        ret = T_CONFLICT;
305                  else                  else
306                  {                  {
307                      sticky_ck (finfo, aflag, vers);                      sticky_ck (finfo, aflag, vers);
# Line 318  Classify_File (struct file_info *finfo, Line 322  Classify_File (struct file_info *finfo,
322                  else                  else
323                      ret = T_NEEDS_MERGE;                      ret = T_NEEDS_MERGE;
324  #else  #else
325                    /* Files with conflict markers and new timestamps fall through
326                     * here, but they need to.  T_CONFLICT is an error in
327                     * commit_fileproc, whereas T_CONFLICT with conflict markers
328                     * is caught but only warned about.  Similarly, update_fileproc
329                     * currently reregisters a file that was conflicted but lost
330                     * its markers.
331                     */
332                  ret = T_MODIFIED;                  ret = T_MODIFIED;
333                  sticky_ck (finfo, aflag, vers);                  sticky_ck (finfo, aflag, vers);
334  #endif  #endif

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.36

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