Problems converting cvs to p4

CVS2P4 doesn't work either...

I'm trying to import my CVS repository into perforce. If I try to do a
direct copy, I get the following output and only the first few files of my
repo are imported:

branched revision has same name as parent
('depot/main/apps/mod_bt/dev/src/libbtt/Makefile'):
    parent:   /mod_bt/src/libbtt/Makefile#1.1 added
    branched: /mod_bt/src/libbtt/Makefile#1.1.1.0 branch @2 <cns> (<undef>)
<undef> <undef> "[vcp] create branch 'cns'"
Perhaps a Map: filter is missing/broken

Dumping the CVS tree into a revml file works. However, trying to import that
revml file into perforce comes up with this result:

vcp v0.9, change number 4232 (2004/03/18)
vcp: running p4 clients
vcp: appending required ChangeSets, StringEdit filters
Patch line disagrees with source line 7:
   source file:
'/home/faraway/dev/vcp_state/revml%58%%58%test%46%rml/source_files/CHANGES/-/1.1'
   patch file :
'/home/faraway/dev/vcp_state/revml%58%%58%test%46%rml/source_files/CHANGES/-/delta'
   result file:
'/home/faraway/dev/vcp_state/revml%58%%58%test%46%rml/source_files/CHANGES/-/1.2'
   source line: "mod_bt 0.0.3, initial release"
   patch  line: "mod_bt 0.0.3, initial release+mod_bt 0.0.3 - initial public
release"
 at /usr/local/share/perl/5.8.8/VCP/Source/revml.pm line 556



I've uploaded my revml file here for inspection:


http://www.crackerjack.net/test.rml.gz


I'd really like to get moved over to perforce ASAP... Does anybody know
what's going on here, or what I can do to make the import work?

	Thanks,
		Tyler