summaryrefslogtreecommitdiffstats
path: root/contrib/cvs/src
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1996-12-19 08:55:10 +0000
committerasami <asami@FreeBSD.org>1996-12-19 08:55:10 +0000
commit051c811f6cd65f0b935283fed04f1e6d927a89ad (patch)
tree88e94916fff1ed79bccdbe037ab1df5b3e707988 /contrib/cvs/src
parent5d1df07976c3a86540770dacde3f20222011ed8f (diff)
downloadFreeBSD-src-051c811f6cd65f0b935283fed04f1e6d927a89ad.zip
FreeBSD-src-051c811f6cd65f0b935283fed04f1e6d927a89ad.tar.gz
Ay, merge from RELENG_2_2. Back out the "moving HEAD" fix.
Diffstat (limited to 'contrib/cvs/src')
-rw-r--r--contrib/cvs/src/diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/cvs/src/diff.c b/contrib/cvs/src/diff.c
index 707ca8e..7520cec 100644
--- a/contrib/cvs/src/diff.c
+++ b/contrib/cvs/src/diff.c
@@ -509,7 +509,7 @@ diff_file_nodiff (file, repository, entries, rcs, vers)
{
/* special handling for TAG_HEAD */
if (diff_rev1 && strcmp (diff_rev1, TAG_HEAD) == 0)
- use_rev1 = xstrdup (vers->srcfile->head);
+ use_rev1 = xstrdup (vers->vn_rcs);
else
{
xvers = Version_TS (repository, (char *) NULL, diff_rev1,
@@ -536,7 +536,7 @@ diff_file_nodiff (file, repository, entries, rcs, vers)
{
/* special handling for TAG_HEAD */
if (diff_rev2 && strcmp (diff_rev2, TAG_HEAD) == 0)
- use_rev2 = xstrdup (vers->srcfile->head);
+ use_rev2 = xstrdup (vers->vn_rcs);
else
{
xvers = Version_TS (repository, (char *) NULL, diff_rev2,
OpenPOWER on IntegriCloud