/[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.36 by dprice, Fri Sep 23 03:19:22 2005 UTC revision 1.37 by dprice, Fri Sep 23 03:41:56 2005 UTC
# Line 324  Classify_File (struct file_info *finfo, Line 324  Classify_File (struct file_info *finfo,
324  #else  #else
325                  /* Files with conflict markers and new timestamps fall through                  /* Files with conflict markers and new timestamps fall through
326                   * here, but they need to.  T_CONFLICT is an error in                   * here, but they need to.  T_CONFLICT is an error in
327                   * commit_fileproc, whereas T_CONFLICT with conflict markers                   * commit_fileproc, whereas T_MODIFIED with conflict markers
328                   * is caught but only warned about.  Similarly, update_fileproc                   * is caught but only warned about.  Similarly, update_fileproc
329                   * currently reregisters a file that was conflicted but lost                   * currently reregisters a file that was conflicted but lost
330                   * its markers.                   * its markers.

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

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