'baz-import-branch' succeeds, but resulting branch is b0rked
James Henstridge
james at jamesh.id.au
Fri Nov 3 08:44:28 GMT 2006
On 03/11/06, Ben Finney <ben at benfinney.id.au> wrote:
> Howdy all,
>
> Yesterday I did the following successful 'baz-import-branch' on a
> branch with some 200+ revisions:
>
> =====
> $ bzr baz-import-branch its-reporting.release-1.09.1/ benf at cyber.com.au--jobs-2006/its-reporting--release--1.09.1
> importing benf at cyber.com.au--jobs-2006/its-reporting--release--1.09.1 into /home/benf/Projects/its-aus/its-reporting.release-1.09.1
> replaced 1 control characters in message
> Cleaning up
> Import complete.
> =====
>
> However, attempts to actually use the resulting branch failed:
>
> =====
> $ cd its-reporting.release-1.09.1/
> $ bzr push sftp://bzr@fs/~/client/its-aus/report-system/its-reporting.release-1.09.1/
> bzr: ERROR: Revision {Arch-1:benf at cyber.com.au--jobs-2005%its-reporting--temp--0.2--patch-1} not present in inventory.
>
> $ cd ..
> $ bzr branch its-reporting.release-1.09.1/ its-reporting.foo-1.09.1/
> bzr: ERROR: Revision {Arch-1:benf at cyber.com.au--jobs-2005%its-reporting--temp--0.2--patch-1} not present in inventory.
> =====
>
> I'm not sure how to interpret the 'check' output, but it seems okay:
>
> =====
> $ bzr check
> checked branch file:///home/benf/Projects/its-aus/its-reporting.release-1.09.1/ format Bazaar-NG Metadir branch format 5
> checked repository <bzrlib.transport.local.LocalTransport url=file:///home/benf/Projects/its-aus/its-reporting.release-1.09.1/> format <RepositoryFormatKnit1>
> 235 revisions
> 1246 unique file texts
> 77415 repeated file texts
> 699 weaves
> 18 ghost revisions
> 18 revisions missing parents in ancestry
> =====
>
> What can I do to find out why this successfully-imported branch is
> failing? Obviously, I also want to be able to use it with bzr.
It is possible that something is failing due to the ghosts left behind
by the import.
Assuming you've still got your benf at cyber.com.au--jobs-2005 archive
around, try running baz-import-branch on the its-reporting--temp--0.2
branch, and then use fetch-ghosts to bring that history into your
converted branch. Something like this:
baz import-branch its-reporting-temp-0.2 \
benf at cyber.com.au--jobs-2005/its-reporting--temp--0.2
cd its-reporting.release-1.09.1
bzr fetch-ghosts ../its-reporting-temp-0.2
If you're switching over to bzr and have all the old history
available, you should try and fill in all the ghosts so you have a
full picture of the history.
James.
More information about the bazaar
mailing list