From 1aedcfb5d35f4c455714f8be7cc6a1055bfb58cd Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 4 Sep 2000 22:12:05 +0000 Subject: Apply patches from the cvs-current package. --- gnu/dist/cvs/src/commit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/dist/cvs/src/commit.c') 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); -- cgit