/[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.72.4.30 by dprice, Mon Jan 31 22:15:12 2005 UTC revision 1.72.4.31 by scjones, Fri Sep 2 19:37:35 2005 UTC
# Line 324  increment_revnum (rev) Line 324  increment_revnum (rev)
324      const char *rev;      const char *rev;
325  {  {
326      char *newrev, *p;      char *newrev, *p;
     int lastfield;  
327      size_t len = strlen (rev);      size_t len = strlen (rev);
328    
329      newrev = xmalloc (len + 2);      newrev = xmalloc (len + 2);
# Line 687  file_has_conflict (finfo, ts_conflict) Line 686  file_has_conflict (finfo, ts_conflict)
686       * conflict any more.       * conflict any more.
687       */       */
688    
 #ifdef SERVER_SUPPORT  
689      if (server_active)      if (server_active)
690          retcode = ts_conflict[0] == '=';          retcode = ts_conflict[0] == '=';
691      else      else
 #endif /* SERVER_SUPPORT */  
692      {      {
693          filestamp = time_stamp (finfo->file);          filestamp = time_stamp (finfo->file);
694          retcode = !strcmp (ts_conflict, filestamp);          retcode = !strcmp (ts_conflict, filestamp);

Legend:
Removed from v.1.72.4.30  
changed lines
  Added in v.1.72.4.31

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