Error when upgrading OOo from dev6 to 2a

[Gary van der Merwe]

Hi

I wanted a big branch for some performance testing, so I downloaded
http://people.canonical.com/~ianc/benchmarks/repos/bzr/OOo-dev6-20090515.tar.bz2

I would like to upgrade the branch from dev6 to 2a. When I tried this,
I got an error. Any ideas on how I can resolve this?

(Bazaar (bzr) 2.1.0rc2)

~/OOo-dev6 $ bzr upgrade
starting upgrade of file:///home/garyvdm/OOo-dev6/
making backup of file:///home/garyvdm/OOo-dev6/.bzr
  to file:///home/garyvdm/OOo-dev6/backup.bzr
starting repository conversion
Doing on-the-fly conversion from <RepositoryFormatCHK1> to <RepositoryFormat2a>.
This may take some time. Upgrade the repositories to the same format
for better performance.

bzr: ERROR: An inconsistent delta was supplied: [(None,
StaticTuple('extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76391',
'makefile.mk'),
'extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76353'), (None,
StaticTuple('extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76391',
'Logging.xcu'),
'extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-77482'), (None,
StaticTuple('scp2sourceooo-20090515121059-86kwpwutkpolsq1d-33275',
'file_improvement.scp'),
'scp2sourceooofile_im-20090515121059-86kwpwutkpolsq1d-76368'), (None,
StaticTuple('extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76391',
'corecontroller.cxx'),
'extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76343'), (None,
StaticTuple('extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76391',
'config.cxx'), 'extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76341'),
(StaticTuple('testautomationextens-20090515121059-86kwpwutkpolsq1d-75564',
'e_update_oooimprovement.inc'), None, None), (None,
StaticTuple('extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76391',
'errormail.cxx'),
'extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76345'), (None,
StaticTuple('scp2sourceooo-20090515121059-86kwpwutkpolsq1d-33275',
'module_improvement.scp'),
'scp2sourceooomodule_-20090515121059-86kwpwutkpolsq1d-76369'), (None,
StaticTuple('extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76391',
'config.hxx'), 'extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76342')]
reason: New items are already in the map
[(StaticTuple('scp2sourceooo-20090515121059-86kwpwutkpolsq1d-33275',
'file_improvement.scp'),
'scp2sourceooofile_im-20090515121059-86kwpwutkpolsq1d-76420'),
(StaticTuple('scp2sourceooo-20090515121059-86kwpwutkpolsq1d-33275',
'module_improvement.scp'),
'scp2sourceooomodule_-20090515121059-86kwpwutkpolsq1d-76421'),
(StaticTuple('extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76391',
'config.cxx'), 'extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76393'),
(StaticTuple('extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76391',
'corecontroller.cxx'),
'extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76395'),
(StaticTuple('extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76391',
'makefile.mk'),
'extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76405'),
(StaticTuple('extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76391',
'errormail.cxx'),
'extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76397'),
(StaticTuple('extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76391',
'config.hxx'), 'extensionssourceoooi-20090515121059-86kwpwutkpolsq1d-76394')].



.bzr.log:  http://paste.ubuntu.com/382078/