[Cvs-cvs] Changes to ccvs/src/update.c [cvs1-11-x-branch]

[Derek Robert Price]

Index: ccvs/src/update.c
diff -u ccvs/src/update.c:1.202.4.27 ccvs/src/update.c:1.202.4.28
--- ccvs/src/update.c:1.202.4.27        Thu Sep 22 18:13:29 2005
+++ ccvs/src/update.c   Sat Sep 24 18:02:28 2005
@@ -2014,6 +2014,15 @@
        retcode = RCS_checkout (finfo->rcs, finfo->file,
                                vers->vn_rcs, vers->tag,
                                vers->options, NULL, NULL, NULL);
+       if (retcode)
+       {
+           error (0, 0, "failed to check out `%s' file", finfo->fullname);
+           error (0, 0, "restoring `%s' from backup file `%s'",
+                  finfo->fullname, backup);
+           rename_file (backup, finfo->file);
+           retval = 1;
+           goto out;
+       }
        xchmod (finfo->file, 1);
 
        RegisterMerge (finfo, vers, backup, 1);