computing the resulting inventory from the merge changeset

[duchier at ps.uni-sb.de]

Aaron Bentley <aaron.bentley at utoronto.ca> writes:

> No, it's a mistake in my email.  You are doing phase 2, but you've split
> phase 1 into two steps.  To make that fail, we can do
>
> $ mkdir foo
> $ touch foo/bar
> $ bzr add
> $ bzr commit
> $ rm foo/bar
> $ bzr mv foo baz
> $ bzr commit

Thank you again so very much for the test case - I am currently busy
converting your examples for inclusion in the test suite (I'll post
that tomorrow).

Cheers,

--Denys