Ay, merge from RELENG_2_2. Back out the "moving HEAD" fix.
This commit is contained in:
parent
ed933d0050
commit
0aa19758df
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user