[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/base.c [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/base.c [signed-commits2] |
Date: |
Thu, 08 Dec 2005 15:49:48 -0500 |
Index: ccvs/src/base.c
diff -u ccvs/src/base.c:1.1.2.11 ccvs/src/base.c:1.1.2.12
--- ccvs/src/base.c:1.1.2.11 Thu Dec 8 15:02:36 2005
+++ ccvs/src/base.c Thu Dec 8 20:49:44 2005
@@ -425,10 +425,13 @@
copy_file (basefile, finfo->file);
if (flags[1] == 'y')
xchmod (finfo->file, true);
- free (basefile);
if (server_active && strcmp (cvs_cmd_name, "export"))
server_base_copy (finfo, rev, flags);
+
+ if (suppress_bases && CVS_UNLINK (basefile) < 0)
+ error (0, errno, "Failed to remove temp file `%s'", basefile);
+ free (basefile);
}
@@ -469,7 +472,7 @@
options)))
error (1, 0, "checkout of revision %s of `%s' failed.\n",
rev1, finfo->fullname);
- if (join || noexec)
+ if (join || noexec || suppress_bases)
{
if (!(f2 = temp_checkout (rcs, finfo, urev, rev2, ptag, rev2, poptions,
options)))
@@ -522,7 +525,7 @@
* changes, the client is going to want to leave base 1.4 and delete base
* 1.1 rather than the other way around.
*/
- if (join || noexec)
+ if (join || noexec || suppress_bases)
{
if (CVS_UNLINK (f2) < 0)
error (0, errno, "unable to remove `%s'", f2);