cvs2svn: another vendor branch problem?

Hi,

I was curious to see how cvs2svn was improved in the last few days (I see that
a lot of work has been done, which is very cool), so to test this I tried to
import part of a large real-world repository: the bind sources from within the
FreeBSD src repo.

While the import completed without warnings, the resulting repository does not
have the same branch information as the CVS repository has; that is, a CVS
checkout of HEAD vs a Subversion checkout of trunk/ does not contain the same
sources. Other branches appear to be correct (at least the few I tried), but
of course the trunk is the most important one for me.

My guess is that it's related to the recent work on issue #1510, cvs2svn: No
support for vendor branches. Since this part of the FreeBSD repository is all
about vendor branches (src/contrib/bind contains vendor imported code that is
referenced by other parts in the source tree).

Indeed, the checked out SVN copy appears to be some revision on the 1.1.1.1.2
branch instead of the latest revision on the 1.1.1 branch (a subtle
difference). This happens with a lot of files in this part of the repository,
but to provide a simple and small example I took the INSTALL,v file from the
repo and just converted that. The tarball of this test repository along with
the command line I used to convert it (in a .sh script) are available at

http://sandcat.nl/~stijn/miscellaneous/svn-vbp.tar.gz

At 10k this is not a very big download; it is modeled after the repo's in
tools/cvs2svn/test-data.

I'll gladly followup to any issue, or make a new one but the Issue Tracker
page said to mail this list first. Please CC me, I'm not subscribed.

And of course congratulations on Subversion as it is now; I'm definitely
converting my (infinitely simpler) personal repository in the next few days!

--Stijn

-- 
Remember, kids: "Q" is always followed by "U". You can learn more on the
Internet in the Spelling FAQU.
		-- James "Kibo" Parry