Conflict when converting my baz branches to bzr

[Guilherme Salgado]

This is the traceback I got when converting my branches to bzr on rocketfuel. All I can tell is that this gina-production is a very old branch (maybe back from the days when all we had was star-merge) and I did lots of merges from and to this branch.

$ /home/warthogs/source/bzr.integration/bzr baz-import <email address hidden> <email address hidden> ../rocketfuel
...
importing <email address hidden>/launchpad--gina-production--0 into /<email address hidden>/launchpad/gina-production
bzr: WARNING: replaced 1 control characters in message
Cleaning up
bzr: ERROR: conflict when applying pybaz.Revision('<email address hidden>/launchpad--gina-production--0--patch-3') to
/<email address hidden>/launchpad/baz2bzr-Gae4dr/rd
  command: '/home/warthogs/source/bzr.integration/bzr' 'baz-import' '<email address hidden>' '<email address hidden>' '../rocketfuel'
      pwd: u'/home/warthogs/archives/salgado'
    error: pybaz.errors.ChangesetConflict
  at /home/pqm/source/pybaz/pybaz/_builtin.py line 2078, in apply()
  see ~/.bzr.log for debug information

[Aaron Bentley (abentley)]

This indicates the source archive is corrupt.

[John A Meinel (jameinel)]

all bug reports should be e-mailed directly to Aaron Bentley