[MERGE][bug 336749] deal with text revisions that originated in revisions that are ghosts in reconcile

[Jelmer Vernooij]

Tom Cato Amundsen wrote:
> The patch definately changes things, but it is not still possible to
> reconcile the solfege.dev branch. With an uptodate bzr.dev (revno
> 4393) and mainline-ghosts-4273.patch and
> referenced-ghost-text-4386.patch I get this error message:
This patch fixes some issues that are unrelated to the sort of ghosts
that were created by arch imports.  The particular issue this fix deals
with only appears with bzr-svn.

Cheers,

Jelmer