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

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

From Revision 836 to 817

Rev	Summary	Authors	Date
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
826	- Actually merge unsynchronized regions. Woot! - Actually merge unsynchronized regions. Woot!	Martin Pool	19 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	19 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	19 years ago
823	quote quote	Martin Pool	19 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	19 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	19 years ago
820	- faster Branch.get_revision_inventory now we know the ids a... - faster Branch.get_revision_inventory now we know the ids are the same	Martin Pool	19 years ago
819	- check command checks that all inventory-ids are the same a... - check command checks that all inventory-ids are the same as in the revision.	Martin Pool	19 years ago
818	- Clear pending-merge list when committing. - Clear pending-merge list when committing.	Martin Pool	19 years ago
817	- Deferred patch that uses Python ndiff format. - Deferred patch that uses Python ndiff format. This highlights the changes within a line, which is rather nice. But it also outputs the entire file, which is less good.	Martin Pool	19 years ago