/[cvs]/ccvs/src/update.c
ViewVC logotype

Diff of /ccvs/src/update.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.256.4.11 by dprice, Fri Dec 2 21:12:45 2005 UTC revision 1.256.4.12 by dprice, Mon Dec 5 20:38:20 2005 UTC
# Line 1383  VERS: ", 0); Line 1383  VERS: ", 0);
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)
# Line 1391  VERS: ", 0); Line 1393  VERS: ", 0);
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 */
# Line 2047  join_file (struct file_info *finfo, Vers Line 2054  join_file (struct file_info *finfo, Vers
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 ? " (" : "",

Legend:
Removed from v.1.256.4.11  
changed lines
  Added in v.1.256.4.12

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26