Ay, merge from RELENG_2_2. Back out the "moving HEAD" fix.

This commit is contained in:
Satoshi Asami 1996-12-19 08:55:10 +00:00
parent ed933d0050
commit 0aa19758df
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=20671

View File

@ -509,7 +509,7 @@ diff_file_nodiff (file, repository, entries, rcs, vers)
{ {
/* special handling for TAG_HEAD */ /* special handling for TAG_HEAD */
if (diff_rev1 && strcmp (diff_rev1, TAG_HEAD) == 0) if (diff_rev1 && strcmp (diff_rev1, TAG_HEAD) == 0)
use_rev1 = xstrdup (vers->srcfile->head); use_rev1 = xstrdup (vers->vn_rcs);
else else
{ {
xvers = Version_TS (repository, (char *) NULL, diff_rev1, 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 */ /* special handling for TAG_HEAD */
if (diff_rev2 && strcmp (diff_rev2, TAG_HEAD) == 0) if (diff_rev2 && strcmp (diff_rev2, TAG_HEAD) == 0)
use_rev2 = xstrdup (vers->srcfile->head); use_rev2 = xstrdup (vers->vn_rcs);
else else
{ {
xvers = Version_TS (repository, (char *) NULL, diff_rev2, xvers = Version_TS (repository, (char *) NULL, diff_rev2,