[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2] |
Date: |
Mon, 05 Dec 2005 15:38:28 -0500 |
Index: ccvs/src/update.c
diff -u ccvs/src/update.c:1.256.4.11 ccvs/src/update.c:1.256.4.12
--- ccvs/src/update.c:1.256.4.11 Fri Dec 2 21:12:45 2005
+++ ccvs/src/update.c Mon Dec 5 20:38:20 2005
@@ -1383,6 +1383,8 @@
/* fix up the vers structure, in case it is used by join */
if (join_rev1)
{
+ Node *n;
+
/* FIXME: Throwing away the original revision info is almost
certainly wrong -- what if join_rev1 is "BASE"? */
if (vers_ts->vn_user != NULL)
@@ -1391,6 +1393,11 @@
free (vers_ts->vn_rcs);
vers_ts->vn_user = xstrdup (xvers_ts->vn_rcs);
vers_ts->vn_rcs = xstrdup (xvers_ts->vn_rcs);
+ n = findnode_fn (finfo->entries, finfo->file);
+ if (n)
+ vers_ts->entdata = n->data;
+ else
+ vers_ts->entdata = NULL;
}
/* If this is really Update and not Checkout, recode history */
@@ -2047,7 +2054,7 @@
char *jdate2;
bool replace_it;
- TRACE (TRACE_FUNCTION, "join_file(%s, %s%s%s%s, %s, %s)",
+ TRACE (TRACE_FUNCTION, "join_file (%s, %s%s%s%s, %s, %s)",
finfo->file,
vers->tag ? vers->tag : "",
vers->tag ? " (" : "",