184 |
* particular files using strings REV1 & REV2. |
* particular files using strings REV1 & REV2. |
185 |
*/ |
*/ |
186 |
int |
int |
187 |
merge (const char *dlabel, const char *dest, const char *j1, const char *j2, |
merge (const char *dest, const char *dlabel, const char *j1, |
188 |
const char *rev1, const char *rev2) |
const char *j1label, const char *j2, const char *j2label) |
189 |
{ |
{ |
190 |
char *diffout; |
char *diffout; |
191 |
int retval; |
int retval; |
201 |
call_diff_add_arg ("-L"); |
call_diff_add_arg ("-L"); |
202 |
call_diff_add_arg (dlabel); |
call_diff_add_arg (dlabel); |
203 |
call_diff_add_arg ("-L"); |
call_diff_add_arg ("-L"); |
204 |
call_diff_add_arg (rev1); |
call_diff_add_arg (j1label); |
205 |
call_diff_add_arg ("-L"); |
call_diff_add_arg ("-L"); |
206 |
call_diff_add_arg (rev2); |
call_diff_add_arg (j2label); |
207 |
|
|
208 |
call_diff_add_arg ("--"); |
call_diff_add_arg ("--"); |
209 |
call_diff_add_arg (dest); |
call_diff_add_arg (dest); |
217 |
else if (retval == 2) |
else if (retval == 2) |
218 |
error (1, 0, "diff3 failed."); |
error (1, 0, "diff3 failed."); |
219 |
|
|
220 |
force_copy_file (diffout, dest); |
copy_file (diffout, dest); |
221 |
|
|
222 |
/* Clean up. */ |
/* Clean up. */ |
223 |
if (CVS_UNLINK (diffout) < 0 && !existence_error (errno)) |
if (CVS_UNLINK (diffout) < 0 && !existence_error (errno)) |