/[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.13 by dprice, Thu Dec 8 15:02:37 2005 UTC revision 1.256.4.14 by dprice, Thu Dec 8 20:49:46 2005 UTC
# Line 2326  join_file (struct file_info *finfo, Vers Line 2326  join_file (struct file_info *finfo, Vers
2326             addition.  */             addition.  */
2327          if (vers->vn_user == NULL)          if (vers->vn_user == NULL)
2328          {          {
             char *saved_options;  
2329              Vers_TS *xvers;              Vers_TS *xvers;
2330    
2331              /* Use NULL for keyword expansion options.  Otherwise, when a              /* Use NULL for keyword expansion options.  Otherwise, when a
# Line 2355  join_file (struct file_info *finfo, Vers Line 2354  join_file (struct file_info *finfo, Vers
2354              /* Added files are always writable until commit.  */              /* Added files are always writable until commit.  */
2355              base_copy (finfo, xvers->vn_rcs, "nyd");              base_copy (finfo, xvers->vn_rcs, "nyd");
2356    
2357              backup = Xasprintf ("%s%s.%s", BAKPREFIX, finfo->file,              Register (finfo->entries, finfo->file, "0",
2358                                  vers->vn_user);                        "Result of merge", NULL, vers->tag, vers->date, NULL);
2359              saved_options = vers->options;              if (server_active)
2360              vers->options = NULL;                  /* No need to create a backup for an addition - if the file
2361              RegisterMerge (finfo, vers, backup, false, true);                   * exists, the client will abort with a warning.
2362              vers->options = saved_options;                   */
2363              free (backup);                  server_updated (finfo, vers, SERVER_UPDATED, (mode_t) -1,
2364                                    NULL, NULL);
2365    
2366              freevers_ts (&xvers);              freevers_ts (&xvers);
2367              return;              return;
# Line 2545  join_file (struct file_info *finfo, Vers Line 2545  join_file (struct file_info *finfo, Vers
2545          else          else
2546              unchanged = false;              unchanged = false;
2547          basefile = make_base_file_name (finfo->file, vers->vn_user);          basefile = make_base_file_name (finfo->file, vers->vn_user);
2548          if (!noexec && isfile (basefile) && !xcmp (basefile, finfo->file))          if (!noexec
2549                && ((isfile (basefile) && !xcmp (basefile, finfo->file))
2550                    || (strcmp (vers->vn_user, "0")
2551                        && !RCS_cmp_file (finfo->rcs, vers->vn_user, NULL, NULL,
2552                                          vers->options, finfo->file))))
2553              isbase = true;              isbase = true;
2554          else          else
2555              isbase = false;              isbase = false;

Legend:
Removed from v.1.256.4.13  
changed lines
  Added in v.1.256.4.14

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