/brz/remove-bazaar : changes

» Changes from revision 3514.4.18

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

From Revision 3514.4.18 to 3514.3.9

expand all

Rev	Summary	Authors	Date
3514.4.18	Bring in both branch-builder threads. Bring in both branch-builder threads.	John Arbash Meinel	17 years ago
3514.4.17	Merge in the latest branch builder work Merge in the latest branch builder work	John Arbash Meinel	17 years ago
3514.4.16	another test for only in OTHER another test for only in OTHER	John Arbash Meinel	17 years ago
3514.4.15	Handle when OTHER doesn't have the entry. Handle when OTHER doesn't have the entry.	John Arbash Meinel	17 years ago
3514.4.14	Add a test which shows that the ordering switches when you p... Add a test which shows that the ordering switches when you pick the other parent.	John Arbash Meinel	17 years ago
3514.4.13	Switch the lca_trees to be in 'find_merge_order'. Switch the lca_trees to be in 'find_merge_order'. We don't have to use that order, but it means we guarantee the lca ordering, rather than just guessing. One alternative that would be a bit faster is just simple lexicographical ordering. Also handle when one of the LCA trees doesn't have an entry.	John Arbash Meinel	17 years ago
3514.4.12	add more filtering for when a directory hasn't actually chan... add more filtering for when a directory hasn't actually changed. This simplifies the tests because it filters out all the root-id noise.	John Arbash Meinel	17 years ago
3514.4.11	Handle when an entry is missing in THIS Handle when an entry is missing in THIS	John Arbash Meinel	17 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	17 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	17 years ago
3514.4.8	Bring in the series work for BranchBuilder. Bring in the series work for BranchBuilder.	John Arbash Meinel	17 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	17 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	17 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	17 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	17 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	17 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	17 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	17 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	17 years ago
3514.3.9	Refactor the large function into multiple small ones. Refactor the large function into multiple small ones.	John Arbash Meinel	17 years ago

Older »