(a) i cannot merge this as the branch does not appear to be based on lp:ubiquity and even though the diff looks sane I'm getting:
bzr: ERROR: Revision {<email address hidden>} not present in "Graph(StackedParentsProvider(bzrlib.repository._LazyListJoin(([CachingParentsProvider(None)], []))))".
(b) the patch looks correct so I will apply it by hand.
(a) i cannot merge this as the branch does not appear to be based on lp:ubiquity and even though the diff looks sane I'm getting: StackedParentsP rovider( bzrlib. repository. _LazyListJoin( ([CachingParent sProvider( None)], []))))".
bzr: ERROR: Revision {<email address hidden>} not present in "Graph(
(b) the patch looks correct so I will apply it by hand.