cvs2svn: branch file addition with --trunk-only

So I've been happily using svn for a month-or-so now (thanks!), and thought it'd be nice to try moving some of my cvs projects over.

As far as I can tell, the only peculiar thing about the file that it is choking on is that it was created on a branch 1.1.2 (not the vendor branch) and was then merged over to the trunk. So revision 1.1 is dead, and the file starts at 1.2 as far as the trunk is concerned. Should I take it that cvs2svn currently doesn't handle this situation properly? In the mean-time, might it be a reasonable idea to hack the rcs file to fool cvs2svn into thinking it was indeed created on the trunk?

(I'd convert the branches too, but it chokes on the first revision. Perhaps that should be a separate message. I can't figure out what's going on there!)

* versions:
cvs2svn r8674, Win2k, ActivePython 2.2.2

* command:
../cvs2svn.py --trunk-only --dump-only path_to_repos

* pertinent output:
committing: Mon Jun 17 17:01:53 2002, over 0 seconds
    deleting 1.1 : 'path_to_file'
Traceback (most recent call last):
  File "../cvs2svn.py", line 2729, in ?
    main()
  File "../cvs2svn.py", line 2725, in main
    convert(ctx, start_pass=start_pass)
  File "../cvs2svn.py", line 2562, in convert
    _passes[i](ctx)
  File "../cvs2svn.py", line 2485, in pass4
    c.commit(dumper, ctx, sym_tracker)
  File "../cvs2svn.py", line 2252, in commit
    path_deleted, closed_tags, closed_branches = \
  File "../cvs2svn.py", line 1365, in delete_path
    branches, prune)
  File "../cvs2svn.py", line 955, in delete_path
    this_entry_val = self.nodes_db[this_entry_key]
  File "../cvs2svn.py", line 147, in __getitem__
    return marshal.loads(self.db[key])
KeyError: 164d

-----------
Kim Sparrow
Sr. Software Engineer
LightPointe
Speed of fiber. Flexibility of wireless.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 19 19:00:05 2004