Intent of TestCommitMerge.test_merge_new_file?
aaron.bentley at utoronto.ca
Sat May 27 16:48:09 BST 2006
-----BEGIN PGP SIGNED MESSAGE-----
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:
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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar