[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2] |
Date: |
Wed, 30 Nov 2005 16:40:41 -0500 |
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.433.4.9 ccvs/src/client.c:1.433.4.10
--- ccvs/src/client.c:1.433.4.9 Wed Nov 30 21:14:56 2005
+++ ccvs/src/client.c Wed Nov 30 21:40:40 2005
@@ -1880,7 +1880,11 @@
if (!noexec && (n = findnode_fn (ent_list, filename)))
{
Entnode *e = n->data;
- base_remove (filename, e->version);
+ /* After a join, control can get here without having changed the
+ * version number. In this case, do not remove the base file.
+ */
+ if (strcmp (vn, e->version))
+ base_remove (filename, e->version);
}
if (base_copy_error)
{
@@ -2446,9 +2450,9 @@
}
/* Won't need these now that the merge is complete. */
- if (e && strcmp (e->version, rev1) && unlink_file (f1) < 0)
+ if ((!e || strcmp (e->version, rev1)) && unlink_file (f1) < 0)
error (0, errno, "unable to remove `%s'", f1);
- if (e && strcmp (e->version, rev2) && unlink_file (f2) < 0)
+ if ((!e || strcmp (e->version, rev2)) && unlink_file (f2) < 0)
error (0, errno, "unable to remove `%s'", f2);
free (f1);
free (f2);
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/17
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/18
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/29
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2],
Derek Robert Price <=
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30