244 |
case 'u': |
case 'u': |
245 |
#ifdef SERVER_SUPPORT |
#ifdef SERVER_SUPPORT |
246 |
if (server_active) |
if (server_active) |
247 |
{ |
rcs_diff_patches = server_use_rcs_diff (); |
|
if (server_use_bases ()) |
|
|
bases = true; |
|
|
else |
|
|
rcs_diff_patches = server_use_rcs_diff (); |
|
|
} |
|
248 |
else |
else |
249 |
#endif |
#endif |
250 |
usage (update_usage); |
usage (update_usage); |
483 |
preload_update_dir ? preload_update_dir : "(null)", xdotemplate, |
preload_update_dir ? preload_update_dir : "(null)", xdotemplate, |
484 |
repository ? repository : "(null)"); |
repository ? repository : "(null)"); |
485 |
|
|
486 |
|
/* Set globals. */ |
487 |
|
if (server_active && server_use_bases ()) |
488 |
|
bases = true; |
489 |
|
|
490 |
/* fill in the statics */ |
/* fill in the statics */ |
491 |
options = xoptions; |
options = xoptions; |
492 |
tag = xtag; |
tag = xtag; |
1984 |
xcmp on the temporary files without much hassle, I think. */ |
xcmp on the temporary files without much hassle, I think. */ |
1985 |
if (!noexec && !bases && !xcmp (backup, finfo->file)) |
if (!noexec && !bases && !xcmp (backup, finfo->file)) |
1986 |
{ |
{ |
1987 |
/* The client will handle these messages when BASES. */ |
if (!quiet) |
1988 |
cvs_output (finfo->fullname, 0); |
{ |
1989 |
cvs_output (" already contains the differences between ", 0); |
/* The client will handle these messages when BASES. */ |
1990 |
cvs_output (vers->vn_user, 0); |
cvs_output ("`", 1); |
1991 |
cvs_output (" and ", 0); |
cvs_output (finfo->fullname, 0); |
1992 |
cvs_output (vers->vn_rcs, 0); |
cvs_output ("' already contains the differences between ", 0); |
1993 |
cvs_output ("\n", 1); |
cvs_output (vers->vn_user, 0); |
1994 |
|
cvs_output (" and ", 5); |
1995 |
|
cvs_output (vers->vn_rcs, 0); |
1996 |
|
cvs_output ("\n", 1); |
1997 |
|
} |
1998 |
|
|
1999 |
retval = 0; |
retval = 0; |
2000 |
goto out; |
goto out; |
2279 |
&& strcmp (vers->ts_user, vers->ts_rcs) == 0 |
&& strcmp (vers->ts_user, vers->ts_rcs) == 0 |
2280 |
&& strcmp (rev2, vers->vn_user) == 0) |
&& strcmp (rev2, vers->vn_user) == 0) |
2281 |
{ |
{ |
2282 |
if (!really_quiet) |
if (!quiet) |
2283 |
{ |
{ |
2284 |
|
cvs_output ("`", 1); |
2285 |
cvs_output (finfo->fullname, 0); |
cvs_output (finfo->fullname, 0); |
2286 |
cvs_output (" already contains the differences between ", 0); |
cvs_output ("' already contains the differences between ", 0); |
2287 |
cvs_output (rev1 ? rev1 : "creation", 0); |
cvs_output (rev1 ? rev1 : "creation", 0); |
2288 |
cvs_output (" and ", 0); |
cvs_output (" and ", 5); |
2289 |
cvs_output (rev2, 0); |
cvs_output (rev2, 0); |
2290 |
cvs_output ("\n", 1); |
cvs_output ("\n", 1); |
2291 |
} |
} |
2504 |
xcmp on the temporary files without much hassle, I think. */ |
xcmp on the temporary files without much hassle, I think. */ |
2505 |
if (!noexec && !xcmp (backup, finfo->file)) |
if (!noexec && !xcmp (backup, finfo->file)) |
2506 |
{ |
{ |
2507 |
if (!really_quiet) |
if (!quiet) |
2508 |
{ |
{ |
2509 |
cvs_output ("`", 1); |
cvs_output ("`", 1); |
2510 |
cvs_output (finfo->fullname, 0); |
cvs_output (finfo->fullname, 0); |