Return-Path: <mark@whistle.com>
Content-Type: text/plain; charset="us-ascii"
X-Sender: mark@alpo.whistle.com
Date: Wed, 31 Mar 1999 12:37:11 -0800
To: info-cvs@gnu.org
From: Mark Peek <mark@whistle.com>
Subject: Log deltas on a branch

When I issue a "cvs log -rtag1:tag2 file" for 2 tags that have been made on
the same branch, I'm getting this error (in CVS 1.10.5 and previous
versions):

  cvs log: invalid branch or revision pair tag1:tag2 in
  `/tmp/cvstest/CVSROOT/test/file,v'

This appears to be a bug in the logic [in src/log.c:log_expand_revlist()]
that determines whether a set of revisions is on the same branch. Using the
"-rtag1:tag2" notation should provide the delta log entries between the
tags on the same branch. However, if the first tag is still on the main
branch (but had been checked out on a branch), the logic for determining
the branch fails to recognize this case.

Is this a known bug? Has anyone else seen this? And, of course the most
important question, has anyone ever done a patch for it?

Thanks,
Mark

==================================================
Steps to reproduce using a clean CVS repository are:

mkdir /tmp/cvstest
cd /tmp/cvstest
setenv CVSROOT /tmp/cvstest/CVSROOT

# Initialize the repository
cvs init

# Import the initial file
mkdir test
echo "foo" > test/file
(cd test; cvs import -m "Initial file" test test start)
rm -rf test

# Check out the file, change it and branch it
cvs checkout test
echo "bar" > test/file
cvs ci -m "minor change" test/file
cvs tag -b branchtag test/file

# Checkout the branch and tag it with a new tag
cvs checkout -rbranchtag test/file
cvs tag tag1 test/file

# Modify the file, check it in and tag it
echo "baz" > test/file
cvs ci -m "Another change" test/file
cvs tag tag2 test/file

# Now try to get the log diff between the 2 tags
cvs log -rtag1:tag2 test/file