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

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

From Revision 846 to 827

Rev	Summary	Authors	Date
846	- start adding refactored/simplified hash cache - start adding refactored/simplified hash cache not used yet	Martin Pool	19 years ago
845	doc doc	Martin Pool	19 years ago
844	- clean up imports of statcache - clean up imports of statcache	Martin Pool	19 years ago
843	- workaround for flaky TestLoader in python2.3 - workaround for flaky TestLoader in python2.3 Now we just list all the test classes manually -- a bit of a pain, but does mean we can run the simpler tests first.	Martin Pool	19 years ago
842	- don't say runit when running tests under python2.3 dammit - don't say runit when running tests under python2.3 dammit	Martin Pool	19 years ago
841	- Start splitting bzr-independent parts of the test framewor... - Start splitting bzr-independent parts of the test framework into testsweet.py	Martin Pool	19 years ago
840	- delay import of subprocess module until it's needed. - delay import of subprocess module until it's needed.	Martin Pool	19 years ago
839	- avoid copying string lists when handling unmatched regions - avoid copying string lists when handling unmatched regions	Martin Pool	19 years ago
838	- Merge3.find_sync_regions() - avoid problems with iters on ... - Merge3.find_sync_regions() - avoid problems with iters on python2.3 by just stepping through arrays; also make this return a list rather than being a generator. Thanks very much to John for the report and help debugging.	Martin Pool	19 years ago
837	- better error when failing to run selftest on python2.3 - better error when failing to run selftest on python2.3	Martin Pool	19 years ago
836	- more merge tests from john - more merge tests from john	Martin Pool	19 years ago
835	doc doc	Martin Pool	19 years ago
834	- Small performance optimization for merge3 - Small performance optimization for merge3	Martin Pool	19 years ago
833	- don't sync up on blank or hash-only lines - don't sync up on blank or hash-only lines	Martin Pool	19 years ago
832	- New Merge3.merge_annotated method for debugging. - New Merge3.merge_annotated method for debugging. - Remove dead code.	Martin Pool	19 years ago
831	- add merge3 test case from Lao-Tzu - add merge3 test case from Lao-Tzu	Martin Pool	19 years ago
830	- handle chunks which differ from the base but agree - handle chunks which differ from the base but agree	Martin Pool	19 years ago
829	- More merge3 cvs-form stuff - More merge3 cvs-form stuff	Martin Pool	19 years ago
828	- code to represent merges in regular text conflict form - code to represent merges in regular text conflict form	Martin Pool	19 years ago
827	- new Merge3.merge_groups feeds back the merged lines - new Merge3.merge_groups feeds back the merged lines	Martin Pool	19 years ago