/[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.202.4.27 by dprice, Thu Sep 22 18:13:29 2005 UTC revision 1.202.4.28 by dprice, Sat Sep 24 18:02:28 2005 UTC
# Line 2014  merge_file (finfo, vers) Line 2014  merge_file (finfo, vers)
2014          retcode = RCS_checkout (finfo->rcs, finfo->file,          retcode = RCS_checkout (finfo->rcs, finfo->file,
2015                                  vers->vn_rcs, vers->tag,                                  vers->vn_rcs, vers->tag,
2016                                  vers->options, NULL, NULL, NULL);                                  vers->options, NULL, NULL, NULL);
2017            if (retcode)
2018            {
2019                error (0, 0, "failed to check out `%s' file", finfo->fullname);
2020                error (0, 0, "restoring `%s' from backup file `%s'",
2021                       finfo->fullname, backup);
2022                rename_file (backup, finfo->file);
2023                retval = 1;
2024                goto out;
2025            }
2026          xchmod (finfo->file, 1);          xchmod (finfo->file, 1);
2027    
2028          RegisterMerge (finfo, vers, backup, 1);          RegisterMerge (finfo, vers, backup, 1);

Legend:
Removed from v.1.202.4.27  
changed lines
  Added in v.1.202.4.28

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