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

Diff of /ccvs/src/server.c

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

revision 1.284.2.40 by scjones, Fri Sep 2 19:37:35 2005 UTC revision 1.284.2.41 by dprice, Thu Sep 22 18:13:28 2005 UTC
# Line 1684  serve_unchanged (arg) Line 1684  serve_unchanged (arg)
1684               * is allowed, but broken versions of WinCVS & TortoiseCVS rely on               * is allowed, but broken versions of WinCVS & TortoiseCVS rely on
1685               * this behavior.               * this behavior.
1686               */               */
1687              *timefield = '=';              if (*timefield != '+')
1688                    /* Skip this for entries with conflict markers.  */
1689                    *timefield = '=';
1690              break;              break;
1691          }          }
1692      }      }
# Line 1755  serve_is_modified (arg) Line 1757  serve_is_modified (arg)
1757               * is allowed, but broken versions of WinCVS & TortoiseCVS rely on               * is allowed, but broken versions of WinCVS & TortoiseCVS rely on
1758               * this behavior.               * this behavior.
1759               */               */
1760              *timefield = 'M';              if (*timefield != '+')
1761                    /* Skip this for entries with conflict markers.  */
1762                    *timefield = 'M';
1763    
1764              if (kopt != NULL)              if (kopt != NULL)
1765              {              {
1766                  if (alloc_pending (strlen (name) + 80))                  if (alloc_pending (strlen (name) + 80))

Legend:
Removed from v.1.284.2.40  
changed lines
  Added in v.1.284.2.41

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