Intent of TestCommitMerge.test_merge_new_file?

[Aaron Bentley]

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

Martin Pool wrote:
| Yes, from the name of the test I think it as Robert says.  But it would
| also be useful to add a test that there is some way to graft together
| previously-unrelated trees.  (This is not to say that grafting has to
| happen implicitly; perhaps you want an option to enable it?)

Oh, we have that:
bzrlib.tests.test_merge_core.FunctionalMergeTest.test_merge_unrelated.

I'm working on the nested by-value trees, so when I add functionality
for joining trees, I will add tests at the same time.

My thinking is that "bzr graft foo/bar foo" will
1. fetch all revisions from bar into foo
2. set a pending merge in foo, of the last revision of bar
3. add all entries from the inventory of bar into foo, but with bar's
tree root being a child of the foo root.
4. remove the control directory for bar
5. commit?

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

iD8DBQFEeHS50F+nu1YWqI0RApgFAJ0Ry9RbLZqqITm9AAJjtfysniYdQQCfRvzD
1Jb9hot9Ks/0V7fIj6c23WU=
=5H1O
-----END PGP SIGNATURE-----