/brz/remove-bazaar : changes

» Changes from revision 2001.1.1

To get this branch, use:

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

From Revision 840 to 821

expand all

Rev	Summary	Authors	Date
840	- delay import of subprocess module until it's needed. - delay import of subprocess module until it's needed.	Martin Pool	20 years ago
839	- avoid copying string lists when handling unmatched regions - avoid copying string lists when handling unmatched regions	Martin Pool	20 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	20 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	20 years ago
836	- more merge tests from john - more merge tests from john	Martin Pool	20 years ago
835	doc doc	Martin Pool	20 years ago
834	- Small performance optimization for merge3 - Small performance optimization for merge3	Martin Pool	20 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	20 years ago
832	- New Merge3.merge_annotated method for debugging. - New Merge3.merge_annotated method for debugging. - Remove dead code.	Martin Pool	20 years ago
831	- add merge3 test case from Lao-Tzu - add merge3 test case from Lao-Tzu	Martin Pool	20 years ago
830	- handle chunks which differ from the base but agree - handle chunks which differ from the base but agree	Martin Pool	20 years ago
829	- More merge3 cvs-form stuff - More merge3 cvs-form stuff	Martin Pool	20 years ago
828	- code to represent merges in regular text conflict form - code to represent merges in regular text conflict form	Martin Pool	20 years ago
827	- new Merge3.merge_groups feeds back the merged lines - new Merge3.merge_groups feeds back the merged lines	Martin Pool	20 years ago
826	- Actually merge unsynchronized regions. Woot! - Actually merge unsynchronized regions. Woot!	Martin Pool	20 years ago
825	- Merge3.find_sync_regions always returns a zero-length sent... - Merge3.find_sync_regions always returns a zero-length sentinal at the end to ease matching. - Merge3.merge partially done.	Martin Pool	20 years ago
824	- Merge3.find_sync_regions yields just a 6-tuple, not a tupl... - Merge3.find_sync_regions yields just a 6-tuple, not a tuple of tuples	Martin Pool	20 years ago
823	quote quote	Martin Pool	20 years ago
822	- Renamed merge3 test suite for easier access. - Renamed merge3 test suite for easier access. - New merge approach based on finding triple-matching regions, and comparing the regions between them; add find_sync_regions() and some tests for it.	Martin Pool	20 years ago
821	- start code for built-in diff3-style resolve - start code for built-in diff3-style resolve - test cases for this	Martin Pool	20 years ago