/[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.8 by dprice, Wed Nov 30 21:22:44 2005 UTC revision 1.256.4.9 by dprice, Thu Dec 1 02:22:36 2005 UTC
# Line 2310  join_file (struct file_info *finfo, Vers Line 2310  join_file (struct file_info *finfo, Vers
2310             addition.  */             addition.  */
2311          if (vers->vn_user == NULL)          if (vers->vn_user == NULL)
2312          {          {
2313              char *saved_options = options;              char *saved_options;
2314              Vers_TS *xvers;              Vers_TS *xvers;
2315    
2316              xvers = Version_TS (finfo, vers->options, jrev2, jdate2, 1, 0);              /* Use NULL for keyword expansion options.  Otherwise, when a
   
             /* Reset any keyword expansion option.  Otherwise, when a  
2317                 command like `cvs update -kk -jT1 -jT2' creates a new file                 command like `cvs update -kk -jT1 -jT2' creates a new file
2318                 (because a file had the T2 tag, but not T1), the subsequent                 (because a file had the T2 tag, but not T1), the subsequent
2319                 commit of that just-added file effectively would set the                 commit of that just-added file effectively would set the
2320                 admin `-kk' option for that file in the repository.  */                 admin `-kk' option for that file in the repository.  */
2321              options = NULL;              xvers = Version_TS (finfo, NULL, jrev2, jdate2, 1, 0);
2322    
2323              if (!really_quiet)              if (!really_quiet)
2324                  error (0, 0, "scheduling addition from revision %s of `%s'.",                  error (0, 0, "scheduling addition from revision %s of `%s'.",
2325                         xvers->vn_rcs, finfo->fullname);                         xvers->vn_rcs, finfo->fullname);
2326    
2327                TRACE (TRACE_DATA, "Adding with keyword mode `%s'", xvers->options);
2328    
2329              /* FIXME: If base_checkout fails, we should arrange to              /* FIXME: If base_checkout fails, we should arrange to
2330                 return a non-zero exit status.  */                 return a non-zero exit status.  */
2331              status = base_checkout (xvers->srcfile, finfo,              status = base_checkout (xvers->srcfile, finfo,
# Line 2339  join_file (struct file_info *finfo, Vers Line 2339  join_file (struct file_info *finfo, Vers
2339    
2340              backup = Xasprintf ("%s%s.%s", BAKPREFIX, finfo->file,              backup = Xasprintf ("%s%s.%s", BAKPREFIX, finfo->file,
2341                                  vers->vn_user);                                  vers->vn_user);
2342                saved_options = vers->options;
2343                vers->options = NULL;
2344              RegisterMerge (finfo, vers, backup, false, true);              RegisterMerge (finfo, vers, backup, false, true);
2345                vers->options = saved_options;
2346              free (backup);              free (backup);
2347    
             options = saved_options;  
   
2348              freevers_ts (&xvers);              freevers_ts (&xvers);
   
2349              return;              return;
2350          }          }
2351    

Legend:
Removed from v.1.256.4.8  
changed lines
  Added in v.1.256.4.9

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