/brz/remove-bazaar : changes

» Changes from revision 1036

To get this branch, use:

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

From Revision 823 to 804

expand all

Rev	Summary	Authors	Date
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
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	20 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	20 years ago
818	- Clear pending-merge list when committing. - Clear pending-merge list when committing.	Martin Pool	20 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	20 years ago
816	- don't write precursor field in new revision xml - don't write precursor field in new revision xml - make parents more primary; remove more precursor code - test commit of revision with parents	Martin Pool	20 years ago
815	- track pending-merges - track pending-merges - unit tests for this	Martin Pool	20 years ago
814	- allow doubled-dashes in revision ids - allow doubled-dashes in revision ids	Martin Pool	20 years ago
813	doc doc	Martin Pool	20 years ago
812	- rename control file to pending-merges - rename control file to pending-merges	Martin Pool	20 years ago
811	- Test case for validate_revision_id - Test case for validate_revision_id	Martin Pool	20 years ago
810	- New validate_revision_id function - New validate_revision_id function	Martin Pool	20 years ago
809	- stubbed out call to merge_core tests - stubbed out call to merge_core tests	Martin Pool	20 years ago
808	- Note new --long log options - Note new --long log options	Martin Pool	20 years ago
807	- New log --long option - New log --long option Patch from William Dodé	Martin Pool	20 years ago
806	- Cope if locale.getpreferredencoding() returns None - Cope if locale.getpreferredencoding() returns None Reported by Uros Trebec	Martin Pool	20 years ago
805	Merge John's log patch: Merge John's log patch: implements bzr log --forward --verbose optimizes so that only logs to be printed are read (rather than reading all and filtering out unwanted).	Martin Pool	20 years ago
804	Patch from John: Patch from John: - StringIO mixes poorly with difflib	Martin Pool	20 years ago