[MERGE] Tolerate ghosts in mainline (#235055)

Andrew Bennetts andrew at canonical.com
Tue Jun 17 01:04:31 BST 2008


Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi all,
> 
> This patch fixes Branch6.revision_history so that it handles mainline
> ghosts the same as Branch5.
> 
> Specifically, ghosts are not permitted in any of the mainline revisions,
> but the lefthand parent of revision 1 may be a ghost.
> 
> The patch ensures this works, and has the same behavior in all branch
> implementations.

bb:approve

Also, this fixes "bzr branch bzr+ssh://..." from an affected branch.

-Andrew.




More information about the bazaar mailing list