computing the resulting inventory from the merge changeset

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

duchier at ps.uni-sb.de wrote:
| Aaron Bentley <aaron.bentley at utoronto.ca> writes:
|
|
|>Case #4:
|>$ touch foo
|>$ touch bar
|>$ bzr add foo bar
|>$ bzr commit
|>$ rm foo
|>$ bzr mv bar foo
|>$ bzr commit
|
|
| I think you meant:
|
|   rm foo
|   bzr rm foo

Right again.  Although I really think if we have a bzr rm command, it
should unlink the file and remove it from the inventory.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDoMuZ0F+nu1YWqI0RAmLaAJ4iJcuaW0+m9kuFYsUqQdRutgEoQwCcDMC3
gcy/ifyHvZZ8SdU6yCuhIV8=
=DqGX
-----END PGP SIGNATURE-----