[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: |
Thu, 01 Dec 2005 10:58:52 -0500 |
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.433.4.12 ccvs/src/client.c:1.433.4.13
--- ccvs/src/client.c:1.433.4.12 Thu Dec 1 03:37:00 2005
+++ ccvs/src/client.c Thu Dec 1 15:58:44 2005
@@ -2385,7 +2385,6 @@
int status;
Node *n;
Entnode *e;
- bool save_noexec;
TRACE (TRACE_FUNCTION, "client_base_merge (%s)", short_pathname);
@@ -2404,11 +2403,8 @@
f2 = make_base_file_name (filename, rev2);
temp_filename = newfilename (filename);
- save_noexec = noexec;
- noexec = false;
- copy_file (filename, temp_filename);
- xchmod (temp_filename, true);
- noexec = save_noexec;
+ force_copy_file (filename, temp_filename);
+ force_xchmod (temp_filename, true);
status = merge (filename, temp_filename, f1, f2, rev1, rev2);
- [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/12/01
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/12/01
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/12/02
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/12/05
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/12/06
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/12/08
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/12/08