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

Diff of /ccvs/src/subr.c

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

revision 1.143 by dprice, Thu May 26 17:48:06 2005 UTC revision 1.144 by scjones, Fri Sep 2 21:51:09 2005 UTC
# Line 607  file_has_conflict (const struct file_inf Line 607  file_has_conflict (const struct file_inf
607       * conflict any more.       * conflict any more.
608       */       */
609    
 #ifdef SERVER_SUPPORT  
610      if (server_active)      if (server_active)
611          retcode = ts_conflict[0] == '=' && ts_conflict[1] == '\0';          retcode = ts_conflict[0] == '=' && ts_conflict[1] == '\0';
612      else      else
 #endif /* SERVER_SUPPORT */  
613      {      {
614          filestamp = time_stamp (finfo->file);          filestamp = time_stamp (finfo->file);
615          retcode = !strcmp (ts_conflict, filestamp);          retcode = !strcmp (ts_conflict, filestamp);

Legend:
Removed from v.1.143  
changed lines
  Added in v.1.144

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