254 |
if (current_parsed_root->isremote) |
if (current_parsed_root->isremote) |
255 |
{ |
{ |
256 |
int pass; |
int pass; |
257 |
|
unsigned int flags = 0; |
258 |
|
|
259 |
/* The first pass does the regular update. If we receive at least |
/* The first pass does the regular update. If we receive at least |
260 |
one patch which failed, we do a second pass and just fetch |
one patch which failed, we do a second pass and just fetch |
294 |
|
|
295 |
if (failed_patches_count == 0) |
if (failed_patches_count == 0) |
296 |
{ |
{ |
|
unsigned int flags = 0; |
|
|
|
|
297 |
/* If the server supports the command "update-patches", that |
/* If the server supports the command "update-patches", that |
298 |
means that it knows how to handle the -u argument to update, |
means that it knows how to handle the -u argument to update, |
299 |
which means to send patches instead of complete files. |
which means to send patches instead of complete files. |
325 |
} |
} |
326 |
else |
else |
327 |
{ |
{ |
328 |
int i; |
TRACE (TRACE_FUNCTION, "refetching unpatchable files\n"); |
|
|
|
|
(void) printf ("%s client: refetching unpatchable files\n", |
|
|
program_name); |
|
329 |
|
|
330 |
if (toplevel_wd != NULL |
if (toplevel_wd != NULL |
331 |
&& CVS_CHDIR (toplevel_wd) < 0) |
&& CVS_CHDIR (toplevel_wd) < 0) |
335 |
|
|
336 |
send_arg ("--"); |
send_arg ("--"); |
337 |
|
|
338 |
for (i = 0; i < failed_patches_count; i++) |
/* Failed patches should only occur with files that were not |
339 |
if (unlink_file (failed_patches[i]) < 0 |
* locally modified. |
340 |
&& !existence_error (errno)) |
*/ |
341 |
error (0, errno, "cannot remove %s", |
flags |= SEND_NO_CONTENTS; |
342 |
failed_patches[i]); |
|
343 |
send_files (failed_patches_count, failed_patches, local, |
send_files (failed_patches_count, failed_patches, local, |
344 |
aflag, update_build_dirs ? SEND_BUILD_DIRS : 0); |
aflag, flags); |
345 |
send_file_names (failed_patches_count, failed_patches, 0); |
send_file_names (failed_patches_count, failed_patches, 0); |
346 |
free_names (&failed_patches_count, failed_patches); |
free_names (&failed_patches_count, failed_patches); |
347 |
} |
} |
1755 |
|
|
1756 |
if (!really_quiet) |
if (!really_quiet) |
1757 |
{ |
{ |
1758 |
write_letter (finfo, 'P'); |
if (trace) |
1759 |
|
write_letter (finfo, 'P'); |
1760 |
|
else |
1761 |
|
write_letter (finfo, 'U'); |
1762 |
} |
} |
1763 |
} |
} |
1764 |
else |
else |