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

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

Rev	Summary	Authors	Date
3514.4.11	Handle when an entry is missing in THIS Handle when an entry is missing in THIS	John Arbash Meinel	16 years ago
3514.4.10	Test the case where BASE is missing a file that is present i... Test the case where BASE is missing a file that is present in THIS, OTHER and all LCAs. Also include both the case where the file is modified, and where it isn't.	John Arbash Meinel	16 years ago
3514.4.9	Use the new series work to make the tests finish even faster... Use the new series work to make the tests finish even faster.	John Arbash Meinel	16 years ago
3514.4.8	Bring in the series work for BranchBuilder. Bring in the series work for BranchBuilder.	John Arbash Meinel	16 years ago
3514.4.7	switch over test_merge to using the new BranchBuilder api. switch over test_merge to using the new BranchBuilder api.	John Arbash Meinel	16 years ago
3514.4.6	Merge in the BranchBuilder updates, which brings in a newer ... Merge in the BranchBuilder updates, which brings in a newer bzr.dev	John Arbash Meinel	16 years ago
3514.4.5	Initial work on _entries_lca. Initial work on _entries_lca. At least get the basic API working, and track when a file is modified. I'm going to need a better test setup if I'm going to handle all the test cases in a way that can be actually understood.	John Arbash Meinel	16 years ago
3514.4.4	Test that the lca_trees are passed down to the Merger object... Test that the lca_trees are passed down to the Merger object when appropriate.	John Arbash Meinel	16 years ago
3514.4.3	Switch to using an in-memory tree when possible Switch to using an in-memory tree when possible	John Arbash Meinel	16 years ago
3514.4.2	Extract the lca trees and the base tree when we find a criss... Extract the lca trees and the base tree when we find a criss-cross	John Arbash Meinel	16 years ago
3514.4.1	Update Merger to set a flag when we encounter a criss-cross ... Update Merger to set a flag when we encounter a criss-cross merge.	John Arbash Meinel	16 years ago
3514.3.10	A mix-matched commit with things moving in each tree. A mix-matched commit with things moving in each tree.	John Arbash Meinel	16 years ago
3514.3.9	Refactor the large function into multiple small ones. Refactor the large function into multiple small ones.	John Arbash Meinel	16 years ago
3514.3.8	Start trying to refactor the big function into smaller ones. Start trying to refactor the big function into smaller ones.	John Arbash Meinel	16 years ago
3514.3.7	comment comment	John Arbash Meinel	16 years ago
3514.3.6	check when there are 3 other trees, rather than just 2 check when there are 3 other trees, rather than just 2	John Arbash Meinel	16 years ago
3514.3.5	Handle some edge cases when we have multiple other trees. Handle some edge cases when we have multiple other trees.	John Arbash Meinel	16 years ago
3514.3.4	Handle more cases when the other tree has extra nodes. Handle more cases when the other tree has extra nodes.	John Arbash Meinel	16 years ago
3514.3.3	Handle when the other tree has extra nodes, and we need to y... Handle when the other tree has extra nodes, and we need to yield them.	John Arbash Meinel	16 years ago
3514.3.2	Handle the case when a record is missing in base Handle the case when a record is missing in base	John Arbash Meinel	16 years ago

Older »