[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog diff.c [signed-commits4]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog diff.c [signed-commits4] |
Date: |
Thu, 13 Apr 2006 14:33:15 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: signed-commits4
Changes by: Derek Robert Price <address@hidden> 06/04/13 14:33:15
Modified files:
src : ChangeLog diff.c
Log message:
* diff.c (diff_fileproc): Correct for Version_TS error when calling
make_file_label.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=signed-commits4&tr1=1.3370.2.2&tr2=1.3370.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/diff.c.diff?only_with_tag=signed-commits4&tr1=1.116.10.1&tr2=1.116.10.2&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3370.2.2 ccvs/src/ChangeLog:1.3370.2.3
--- ccvs/src/ChangeLog:1.3370.2.2 Wed Apr 12 20:32:08 2006
+++ ccvs/src/ChangeLog Thu Apr 13 14:33:15 2006
@@ -1,3 +1,8 @@
+2006-04-13 Derek Price <address@hidden>
+
+ * diff.c (diff_fileproc): Correct for Version_TS error when calling
+ make_file_label.
+
2006-04-12 Derek Price <address@hidden>
* lock.c: #include "repos.h" for proto.
Index: ccvs/src/diff.c
diff -u ccvs/src/diff.c:1.116.10.1 ccvs/src/diff.c:1.116.10.2
--- ccvs/src/diff.c:1.116.10.1 Wed Apr 12 02:36:58 2006
+++ ccvs/src/diff.c Thu Apr 13 14:33:15 2006
@@ -978,7 +978,14 @@
label2 = make_file_label (DEVNULL, NULL, NULL, NULL);
else
label2 = make_file_label (finfo->fullname, use_rev2,
- vers->ts_user, finfo->rcs);
+ /* FIXME: make_file_label should be able
+ * to trust vers->ts_user, but
+ * Version_TS isn't setting it correctly
+ * when base files are suppressed.
+ */
+ server_active
+ ? "Is-modified" : vers->ts_user,
+ finfo->rcs);
if (!have_rev1_label)
{
if (empty_file == DIFF_ADDED)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/src ChangeLog diff.c [signed-commits4],
Derek Robert Price <=