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); |
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); |