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

Diff of /ccvs/src/vers_ts.c

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

revision 1.43.4.7 by scjones, Wed Jun 22 18:56:05 2005 UTC revision 1.43.4.8 by dprice, Thu Sep 22 18:13:29 2005 UTC
# Line 302  time_stamp_server (file, vers_ts, entdat Line 302  time_stamp_server (file, vers_ts, entdat
302          else if (entdata->timestamp          else if (entdata->timestamp
303                   && entdata->timestamp[0] == '=')                   && entdata->timestamp[0] == '=')
304              mark_unchanged (vers_ts);              mark_unchanged (vers_ts);
305            else if (entdata->conflict
306                     && entdata->conflict[0] == '=')
307            {
308                /* These just need matching content.  Might as well minimize it.  */
309                vers_ts->ts_user = xstrdup ("");
310                vers_ts->ts_conflict = xstrdup ("");
311            }
312          else if (entdata->timestamp          else if (entdata->timestamp
313                   && (entdata->timestamp[0] == 'M'                   && (entdata->timestamp[0] == 'M'
314                       || entdata->timestamp[0] == 'D')                       || entdata->timestamp[0] == 'D')

Legend:
Removed from v.1.43.4.7  
changed lines
  Added in v.1.43.4.8

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