summaryrefslogtreecommitdiff
path: root/gnu/dist/cvs/src/commit.c
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2000-09-04 22:12:05 +0000
committerchristos <christos@NetBSD.org>2000-09-04 22:12:05 +0000
commit1aedcfb5d35f4c455714f8be7cc6a1055bfb58cd (patch)
treecb4203d99d49e7df886bba16dbd5d1177f10097a /gnu/dist/cvs/src/commit.c
parentd30d584a9145d43c1e61e7e8a36854dbcee630e4 (diff)
Apply patches from the cvs-current package.
Diffstat (limited to 'gnu/dist/cvs/src/commit.c')
-rw-r--r--gnu/dist/cvs/src/commit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/dist/cvs/src/commit.c b/gnu/dist/cvs/src/commit.c
index d9a7d604b20..862171b49d8 100644
--- a/gnu/dist/cvs/src/commit.c
+++ b/gnu/dist/cvs/src/commit.c
@@ -1005,7 +1005,9 @@ warning: file `%s' seems to still contain conflict indicators",
xmalloc (sizeof (struct logfile_info)));
li->type = status;
li->tag = xstrdup (vers->tag);
- li->rev_old = xstrdup (vers->vn_rcs);
+ /* If the file was re-added, we want the revision in the commitlog
+ to be NONE, not the previous dead revision. */
+ li->rev_old = status == T_ADDED ? NULL : xstrdup (vers->vn_rcs);
li->rev_new = NULL;
p->data = (char *) li;
(void) addnode (ulist, p);