1288 |
*/ |
*/ |
1289 |
status = base_checkout (vers_ts->srcfile, finfo, |
status = base_checkout (vers_ts->srcfile, finfo, |
1290 |
vers_ts->vn_user, vers_ts->vn_rcs, |
vers_ts->vn_user, vers_ts->vn_rcs, |
1291 |
|
vers_ts->entdata |
1292 |
|
? vers_ts->entdata->tag : NULL, |
1293 |
vers_ts->tag, |
vers_ts->tag, |
1294 |
vers_ts->entdata |
vers_ts->entdata |
1295 |
? vers_ts->entdata->options |
? vers_ts->entdata->options : NULL, |
|
: NULL, |
|
1296 |
vers_ts->options); |
vers_ts->options); |
1297 |
} |
} |
1298 |
|
|
1901 |
to treat any such mismatch as an automatic conflict. -twp */ |
to treat any such mismatch as an automatic conflict. -twp */ |
1902 |
|
|
1903 |
status = base_checkout (finfo->rcs, finfo, vers->vn_user, vers->vn_rcs, |
status = base_checkout (finfo->rcs, finfo, vers->vn_user, vers->vn_rcs, |
1904 |
vers->tag, vers->entdata->options, |
vers->entdata->tag, vers->tag, |
1905 |
vers->options); |
vers->entdata->options, vers->options); |
1906 |
base_copy (finfo, vers->vn_rcs, "yy"); |
base_copy (finfo, vers->vn_rcs, "yy"); |
1907 |
|
|
1908 |
if (status) |
if (status) |
1933 |
goto out; |
goto out; |
1934 |
} |
} |
1935 |
|
|
1936 |
status = base_merge (finfo->rcs, finfo, vers->options, vers->vn_user, |
status = base_merge (finfo->rcs, finfo, vers->entdata->tag, |
1937 |
|
vers->entdata->options, vers->options, vers->vn_user, |
1938 |
vers->vn_user, vers->vn_rcs); |
vers->vn_user, vers->vn_rcs); |
1939 |
|
|
1940 |
if (status != 0 && status != 1) |
if (status != 0 && status != 1) |
2333 |
return a non-zero exit status. */ |
return a non-zero exit status. */ |
2334 |
status = base_checkout (xvers->srcfile, finfo, |
status = base_checkout (xvers->srcfile, finfo, |
2335 |
NULL, xvers->vn_rcs, |
NULL, xvers->vn_rcs, |
2336 |
|
xvers->entdata |
2337 |
|
? xvers->entdata->tag : NULL, |
2338 |
xvers->tag, |
xvers->tag, |
2339 |
xvers->entdata |
xvers->entdata |
2340 |
? xvers->entdata->options : NULL, |
? xvers->entdata->options : NULL, |
2471 |
* Also, it is safe to pass in NULL for nametag since we know no |
* Also, it is safe to pass in NULL for nametag since we know no |
2472 |
* substitution is happening during the binary mode checkout. |
* substitution is happening during the binary mode checkout. |
2473 |
*/ |
*/ |
2474 |
if (base_checkout (finfo->rcs, finfo, vers->vn_user, rev2, vers->tag, |
if (base_checkout (finfo->rcs, finfo, vers->vn_user, rev2, |
2475 |
|
vers->entdata->tag, vers->tag, |
2476 |
vers->entdata->options, t_options) != 0) |
vers->entdata->options, t_options) != 0) |
2477 |
error (1, 0, "Checkout of revision %s of `%s' failed.", |
error (1, 0, "Checkout of revision %s of `%s' failed.", |
2478 |
rev2, finfo->fullname); |
rev2, finfo->fullname); |
2501 |
} |
} |
2502 |
} |
} |
2503 |
else |
else |
2504 |
status = base_merge (finfo->rcs, finfo, t_options, |
status = base_merge (finfo->rcs, finfo, vers->entdata->tag, |
2505 |
|
vers->entdata->options, t_options, |
2506 |
vers->vn_user, rev1, rev2); |
vers->vn_user, rev1, rev2); |
2507 |
|
|
2508 |
if (status != 0) |
if (status != 0) |