Problem when trying to import CVS module

[asafm]

I am now evaluating BZR for our internal use, but a mandatory request is to import CVS...

Our old cvs version is Concurrent Versions System (CVS) 1.11.2 (client/server)

This what I tried to do on out Ubuntu machine...

Ubuntu 7.10

Bazaar (bzr) 0.90.0
  Python interpreter: /usr/bin/python 2.5.1.final.0
  Python standard library: /usr/lib/python2.5
  bzrlib: /usr/lib/python2.5/site-packages/bzrlib
  Bazaar configuration: /home/changeme/.bazaar
  Bazaar log file: /home/changeme/.bzr.log

cvsps version 2.1

bzr cvsps-import mnt1/data/REPOSITORY/projects/winpath/ refapps refapps
Creating cvsps dump file: refapps/staging/refapps.dump
Read 6300 patchsets (string cache hits: 0, total: 11831)
Failed while processing: Patchset(1, HEAD, pazh, 2003/11/25 09:55:02)
Processed 0 patches (0 new, 0 existing) on 0 branches (1 tags) in 1.2s (0.00 patch/s)
bzr: ERROR: exceptions.AssertionError:

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 817, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 779, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 477, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/changeme/.bazaar/plugins/cvsps_import/__init__.py", line 95, in run
    importer.process()
  File "/home/changeme/.bazaar/plugins/cvsps_import/cvsps/importer.py", line 1269, in process
    self._process_patchsets(cvs_to_bzr, patchsets, pb=pb)
  File "/home/changeme/.bazaar/plugins/cvsps_import/cvsps/importer.py", line 1208, in _process_patchsets
    rev_id, action = cvs_to_bzr.handle_patchset(patchset)
  File "/home/changeme/.bazaar/plugins/cvsps_import/cvsps/importer.py", line 749, in handle_patchset
    revision_id = self._extract_changes(patchset)
  File "/home/changeme/.bazaar/plugins/cvsps_import/cvsps/importer.py", line 1008, in _extract_changes
    revision_id=cvs_revision_id,
  File "/home/changeme/.bazaar/plugins/cvsps_import/cvsps/importer.py", line 403, in commit
    assert self._revision_id == branch_rev
AssertionError

bzr 0.90.0 on python 2.5.1.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'cvsps-import', 'mnt1/data/REPOSITORY/projects/winpath/', 'refapps', 'refapps']

Regards

Asaf

[Jelmer Vernooij (jelmer)]

Can you still reproduce this?

Can you run this with BZR_PDB=1 and then in the resulting prompt, run:

print self._revision_id
print branch_rev