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

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

Rev	Summary	Authors	Date
3514.4.25	A few more merge-level behavior tests. A few more merge-level behavior tests.	John Arbash Meinel	16 years ago
3514.4.24	Implement support for 'interesting_files' and 'interesting_i... Implement support for 'interesting_files' and 'interesting_ids' for _entries_lca	John Arbash Meinel	16 years ago
3514.4.23	Handle when there are more than 2 LCAs while searching for t... Handle when there are more than 2 LCAs while searching for the unique lca.	John Arbash Meinel	16 years ago
3514.4.22	Handle executable bit changes as well. Handle executable bit changes as well.	John Arbash Meinel	16 years ago
3514.4.21	Hook up the lca-way logic into the path handlers. Hook up the lca-way logic into the path handlers. Add at least 1 test which would fail without using this logic. Lots more tests to follow. Mostly stuff that we can't really test at the lower levels.	John Arbash Meinel	16 years ago
3514.4.20	Use the _lca_multi_way to work out if there is actually a ki... Use the _lca_multi_way to work out if there is actually a kind/parent/name/content change. This lets us filter out nodes that aren't interesting, as well as properly set the 'content_changed' flag.	John Arbash Meinel	16 years ago
3514.4.19	Add the _lca_multi_way function, and explicit tests. Add the _lca_multi_way function, and explicit tests. There may be some other edge cases, but I think I covered them all.	John Arbash Meinel	16 years ago
3514.4.18	Bring in both branch-builder threads. Bring in both branch-builder threads.	John Arbash Meinel	16 years ago
3514.4.17	Merge in the latest branch builder work Merge in the latest branch builder work	John Arbash Meinel	16 years ago
3514.4.16	another test for only in OTHER another test for only in OTHER	John Arbash Meinel	16 years ago
3514.4.15	Handle when OTHER doesn't have the entry. Handle when OTHER doesn't have the entry.	John Arbash Meinel	16 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	16 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	16 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	16 years ago
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