[MERGE] Initial support for marking bugs as fixed using bzr

[Martin Pool]

On 4/14/07, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:

> > 1) could be addressed either by asking users to supply 2 patches (one
> > complete, and one to focus on). Which might also mean BB should support
> > displaying multiple diffs. (But that opens up a can-of-worms if both are
> > bundles and point to different revision ids. "Which one are you wanting
> > to be merged again????") I think humans can sort this stuff out, but I
> > don't know where that would leave BB.
>
> In cases like this one, I think BB could pick the latest revision.
> Also, merge directives are unambiguous about which revision they suggest
> merging.

I think humans could provide the diff they think is most meaningful,
whether that's incremental or total.  BB (or something like it) can
generate the full diff from the latest ancestor in the trunk.

> I am hesitant to put heavy-duty VCS functions on that box.  It's only a
> virtual server.

Canonical should be able to provide a machine (with interactive login
for you) if that would help...  Contact me off the list.

-- 
Martin