[Cvs-cvs] ccvs/src ChangeLog commit.c

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Larry Jones <address@hidden>    06/01/09 21:24:31

Modified files:
        src            : ChangeLog commit.c 

Log message:
        merge changes from cvs1-11-x-branch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3332&tr2=1.3333&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/commit.c.diff?tr1=1.257&tr2=1.258&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3332 ccvs/src/ChangeLog:1.3333
--- ccvs/src/ChangeLog:1.3332   Thu Jan  5 15:55:05 2006
+++ ccvs/src/ChangeLog  Mon Jan  9 21:24:31 2006
@@ -1,3 +1,8 @@
+2006-01-09  Larry Jones  <address@hidden>
+
+       * commit.c (remove_file): Record correct revision in history file.
+       (Reported by Chris Reed <address@hidden>.)
+
 2006-01-05  Derek Price  <address@hidden>
 
        * recurse.c (start_recursion): Expand header comment block.
Index: ccvs/src/commit.c
diff -u ccvs/src/commit.c:1.257 ccvs/src/commit.c:1.258
--- ccvs/src/commit.c:1.257     Thu Nov 10 20:20:20 2005
+++ ccvs/src/commit.c   Mon Jan  9 21:24:31 2006
@@ -1831,7 +1831,9 @@
     }
     /* At this point, the file has been committed as removed.  We should
        probably tell the history file about it  */
-    history_write ('R', NULL, finfo->rcs->head, finfo->file, 
finfo->repository);
+    corev = rev ? RCS_getbranch (finfo->rcs, rev, 1) : RCS_head (finfo->rcs);
+    history_write ('R', NULL, corev, finfo->file, finfo->repository);
+    free (corev);
 
     if (rev != NULL)
        free (rev);