Comment 10 for bug 250480

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Trying to merge fails on bzr trying to access file id

951@1811c9d2-c306-0410-128--e57aa55c946:trunk:conduit%2Fmodules%2FFileModule%2FFileModule.py

in revision

 john@nzjrs-uni-20080604054725-xb4vevcba6m9c8u6

this revision id doesn't appear anywhere in branch "1"'s log and nowhere in the inventory xmls.

It does exist in "2" though where it is the parent of a right hand side parent of a revision that is also in "1", <email address hidden>

it seems to me like this is a case where merge doesn't fetch all the ghosts into the target repository before doing the actual merge.