[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2] |
Date: |
Wed, 30 Nov 2005 00:04:17 -0500 |
Index: ccvs/src/update.c
diff -u ccvs/src/update.c:1.256.4.4 ccvs/src/update.c:1.256.4.5
--- ccvs/src/update.c:1.256.4.4 Tue Nov 29 23:44:20 2005
+++ ccvs/src/update.c Wed Nov 30 05:04:14 2005
@@ -1301,10 +1301,19 @@
Vers_TS *xvers_ts;
if (!file_is_dead)
- base_copy (finfo, vers_ts->vn_rcs,
- cvswrite && !fileattr_get (finfo->file, "_watched")
- ? "my" : "mn");
-
+ {
+ char flags[3];
+ if (vers_ts->ts_user)
+ flags[0] = 'y';
+ else
+ flags[0] = 'n';
+ if (cvswrite && !fileattr_get (finfo->file, "_watched"))
+ flags[1] = 'y';
+ else
+ flags[1] = 'n';
+ flags[2] = '\0';
+ base_copy (finfo, vers_ts->vn_rcs, flags);
+ }
{
/* A newly checked out file is never under the spell
of "cvs edit". If we think we were editing it
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/18
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/29
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2],
Derek Robert Price <=
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/30