| no_diff.c (32785) | no_diff.c (34461) |
|---|---|
| 1/* 2 * Copyright (c) 1992, Brian Berliner and Jeff Polk 3 * Copyright (c) 1989-1992, Brian Berliner 4 * 5 * You may distribute under the terms of the GNU General Public License as 6 * specified in the README file that comes with the CVS source distribution. 7 * 8 * No Difference --- 22 unchanged lines hidden (view full) --- 31 different (since we don't have the file's contents). */ 32 if (vers->ts_user != NULL 33 && strcmp (vers->ts_user, "Is-modified") == 0) 34 return -1; 35 36 if (!vers->srcfile || !vers->srcfile->path) 37 return (-1); /* different since we couldn't tell */ 38 | 1/* 2 * Copyright (c) 1992, Brian Berliner and Jeff Polk 3 * Copyright (c) 1989-1992, Brian Berliner 4 * 5 * You may distribute under the terms of the GNU General Public License as 6 * specified in the README file that comes with the CVS source distribution. 7 * 8 * No Difference --- 22 unchanged lines hidden (view full) --- 31 different (since we don't have the file's contents). */ 32 if (vers->ts_user != NULL 33 && strcmp (vers->ts_user, "Is-modified") == 0) 34 return -1; 35 36 if (!vers->srcfile || !vers->srcfile->path) 37 return (-1); /* different since we couldn't tell */ 38 |
| 39#ifdef PRESERVE_PERMISSIONS_SUPPORT 40 /* If special files are in use, then any mismatch of file metadata 41 information also means that the files should be considered different. */ 42 if (preserve_perms && special_file_mismatch (finfo, vers->vn_user, NULL)) 43 return 1; 44#endif 45 |
|
| 39 if (vers->entdata && vers->entdata->options) 40 options = xstrdup (vers->entdata->options); 41 else 42 options = xstrdup (""); 43 44 tocvsPath = wrap_tocvs_process_file (finfo->file); 45 retcode = RCS_cmp_file (vers->srcfile, vers->vn_user, options, 46 tocvsPath == NULL ? finfo->file : tocvsPath); --- 45 unchanged lines hidden --- | 46 if (vers->entdata && vers->entdata->options) 47 options = xstrdup (vers->entdata->options); 48 else 49 options = xstrdup (""); 50 51 tocvsPath = wrap_tocvs_process_file (finfo->file); 52 retcode = RCS_cmp_file (vers->srcfile, vers->vn_user, options, 53 tocvsPath == NULL ? finfo->file : tocvsPath); --- 45 unchanged lines hidden --- |