~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes from revision 3514.4.45

Rev	Summary	Authors	Date
3514.4.45	Bring in the 1.7 branch Bring in the 1.7 branch	John Arbash Meinel	16 years ago
3514.4.44	Revert the path2id fix, because to_dir can be anywhere, not ... Revert the path2id fix, because to_dir can be anywhere, not just in the same directory.	John Arbash Meinel	16 years ago
3514.4.43	Merge in bzr.dev 3691 Merge in bzr.dev 3691	John Arbash Meinel	16 years ago
3514.4.42	Cleanups to the algorithm documentation. Cleanups to the algorithm documentation.	John Arbash Meinel	16 years ago
3514.4.41	Some grammar and other clarity feedback from Aaron. Some grammar and other clarity feedback from Aaron.	John Arbash Meinel	16 years ago
3514.4.40	Make 'resolver' a required parameter. Make 'resolver' a required parameter.	John Arbash Meinel	16 years ago
3514.4.39	Use self._lca_multi_way rather than Merge3Merger._lca_multi_... Use self._lca_multi_way rather than Merge3Merger._lca_multi_way by Aaron's request.	John Arbash Meinel	16 years ago
3514.4.38	Use direct access to the inventory instead of path2id. Use direct access to the inventory instead of path2id.	John Arbash Meinel	16 years ago
3514.4.37	Tests pass when using _entries_lca as the default algorithm. Tests pass when using _entries_lca as the default algorithm. The only test that doesn't pass is a bug in MultiWalker, which has a fix being merged already.	John Arbash Meinel	16 years ago
3514.4.36	Optimizing how we extracted multiple trees left a path that ... Optimizing how we extracted multiple trees left a path that didn't create a base_tree. Fixed.	John Arbash Meinel	16 years ago
3514.4.35	Add a test that we only call get_symlink_target if the objec... Add a test that we only call get_symlink_target if the object should be a symlink.	John Arbash Meinel	16 years ago
3514.4.34	Handle symlinks properly when objects are not RevisionTrees Handle symlinks properly when objects are not RevisionTrees	John Arbash Meinel	16 years ago
3514.4.33	Implement support for 'tree-reference'. Implement support for 'tree-reference'. It seems that _entries3 always returns False for content changed, I would have thought it would look at entry.revision in those circumstances. Anyway, it seems to work for what we need.	John Arbash Meinel	16 years ago
3514.4.32	Add a test for proper behavior when everything is a WT. Add a test for proper behavior when everything is a WT. This only really happens in the test suite, you'll never get a LCA Tree as a WT in standard behavior (I don't know if you could get a BASE tree as a wT). Also, clean up some trailing whitespace.	John Arbash Meinel	16 years ago
3514.4.31	Add expected failures for cases where we should be looking a... Add expected failures for cases where we should be looking at more than just BASE + LCAs, such as intermediate LCAs, or the whole per-file/attribute graph. They are fairly unlikely, but it is good to know that we don't handle them yet.	John Arbash Meinel	16 years ago
3514.4.30	Several updates. Several updates. Add a document describing the merge algorithm, and the rationale for the different steps. Change the sha1 algorithm to use get_file_sha1() rather than assuming the inventory entries text_sha1 value is correct. (It is always None for working trees.) For sha1-values specifically, don't allow overruling an LCA value when one tip seems to supersede the other's value. We will still do this for names and parent_ids. Add tests that we conflict if lcas disagree and tips do not have the same content, even if one of them is an lca value, and one is newer.	John Arbash Meinel	16 years ago
3514.4.29	We have added the symlink tests, and now have covered all th... We have added the symlink tests, and now have covered all the ones I was aware of.	John Arbash Meinel	16 years ago
3514.4.28	More symlink tests. More symlink tests. Test that we properly track content changes for symlinks, and that we merge them correctly. Also add a test for the expected failure of the 3-way merge logic on content of symlinks (and files.)	John Arbash Meinel	16 years ago
3514.4.27	A couple of symlink tests, we need to do more. A couple of symlink tests, we need to do more.	John Arbash Meinel	16 years ago
3514.4.26	Clean up comments, only symlink support left. Clean up comments, only symlink support left.	John Arbash Meinel	16 years ago

Older »