1383 |
/* fix up the vers structure, in case it is used by join */ |
/* fix up the vers structure, in case it is used by join */ |
1384 |
if (join_rev1) |
if (join_rev1) |
1385 |
{ |
{ |
1386 |
|
Node *n; |
1387 |
|
|
1388 |
/* FIXME: Throwing away the original revision info is almost |
/* FIXME: Throwing away the original revision info is almost |
1389 |
certainly wrong -- what if join_rev1 is "BASE"? */ |
certainly wrong -- what if join_rev1 is "BASE"? */ |
1390 |
if (vers_ts->vn_user != NULL) |
if (vers_ts->vn_user != NULL) |
1393 |
free (vers_ts->vn_rcs); |
free (vers_ts->vn_rcs); |
1394 |
vers_ts->vn_user = xstrdup (xvers_ts->vn_rcs); |
vers_ts->vn_user = xstrdup (xvers_ts->vn_rcs); |
1395 |
vers_ts->vn_rcs = xstrdup (xvers_ts->vn_rcs); |
vers_ts->vn_rcs = xstrdup (xvers_ts->vn_rcs); |
1396 |
|
n = findnode_fn (finfo->entries, finfo->file); |
1397 |
|
if (n) |
1398 |
|
vers_ts->entdata = n->data; |
1399 |
|
else |
1400 |
|
vers_ts->entdata = NULL; |
1401 |
} |
} |
1402 |
|
|
1403 |
/* If this is really Update and not Checkout, recode history */ |
/* If this is really Update and not Checkout, recode history */ |
2054 |
char *jdate2; |
char *jdate2; |
2055 |
bool replace_it; |
bool replace_it; |
2056 |
|
|
2057 |
TRACE (TRACE_FUNCTION, "join_file(%s, %s%s%s%s, %s, %s)", |
TRACE (TRACE_FUNCTION, "join_file (%s, %s%s%s%s, %s, %s)", |
2058 |
finfo->file, |
finfo->file, |
2059 |
vers->tag ? vers->tag : "", |
vers->tag ? vers->tag : "", |
2060 |
vers->tag ? " (" : "", |
vers->tag ? " (" : "", |