"parent_id not in inventory" with mixed revision branch

[Christian Gudrian]

Given a small subversion repository which only contains an initial import, two file modifications and a mixed revision branch operation I get the following error when executing "bzr branch svn://localhost/branches/1.0":

bzr: ERROR: parent_id {1@1a1de948-c189-43fc-be45-ab83e0dedb8a:trunk%2Fdir1%2Fdir2%2Fdir3} not in inventory

The subversion repository (dump attached) contains these modifications:

------------------------------------------------------------------------
r4 | (no author) | 2009-01-12 14:58:48 +0100 (Mon, 12 Jan 2009) | 1 line
Changed paths:
   A /branches/1.0 (from /trunk:3)
   R /branches/1.0/dir1 (from /trunk/dir1:2)

Created a branch with mixed revisions
------------------------------------------------------------------------
r3 | (no author) | 2009-01-12 14:58:48 +0100 (Mon, 12 Jan 2009) | 1 line
Changed paths:
   M /trunk/dir1/dir2/dir3/file.txt

Modified another file
------------------------------------------------------------------------
r2 | (no author) | 2009-01-12 14:58:48 +0100 (Mon, 12 Jan 2009) | 1 line
Changed paths:
   M /trunk/dir1/file.txt

Modified a file
------------------------------------------------------------------------
r1 | (no author) | 2009-01-12 14:58:48 +0100 (Mon, 12 Jan 2009) | 1 line
Changed paths:
   A /branches
   A /trunk
   A /trunk/dir1
   A /trunk/dir1/dir2
   A /trunk/dir1/dir2/dir3
   A /trunk/dir1/dir2/dir3/file.txt
   A /trunk/dir1/file.txt

Initial import
------------------------------------------------------------------------

Revisions involved:
Bazaar: <email address hidden>
bzr-svn: <email address hidden>

[Wesley J. Landaker (wjl)]

I can confirm this bug with the latest bzr-svn 0.5 (rev 2292).

[Jelmer Vernooij (jelmer)]

added a test for this to the 0.5 branch

[Jelmer Vernooij (jelmer)]

This is now *somewhat* fixed. It no longer blows up but dir1/file.txt seems to be missing (bug 308353)

[Christian Gudrian (cgudrian)]

Thanks. I'll have a look at what happens with the real world repository I've encountered that bug with at first.

[Christian Gudrian (cgudrian)]

The real world repository makes bzr-svn explode. Possibly because the missing file is modified afterwards. I'll try to set up a test repository for further investigation. Should I reopen this bug or file a new one?

[Jelmer Vernooij (jelmer)]

That's most likely caused by the other bug I mentioned (bug 308353)

[Christian Gudrian (cgudrian)]

Not sure about that. If I add another revision to the subversion repository that modifies branches/1.0/dir1/file.txt, I get the error message:

bzr: ERROR: Unable to find file id for child 'file.txt' in 'dir1' in <RevisionMetadata for revision 5, path branches/1.0 in repository '67e5a9f3-fd31-4ac5-b9e1-8972478448c8'>.

bug 308353 appears to deal with a different bug.

[Christian Gudrian (cgudrian)]

The fix of bug 308353 also fixes this one. Thanks!