/brz/remove-bazaar : changes

» Changes from revision 3144.6.1

To get this branch, use:

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

From Revision 3144.6.1 to 3138

expand all

Rev	Summary	Authors	Date
3144.6.1	Update documentation to reflect conflict-handling difference Update documentation to reflect conflict-handling difference	Aaron Bentley	17 years ago
3144.5.4	Update NEWS Update NEWS	Aaron Bentley	17 years ago
3144.5.3	Test interesting_files for LCA merge Test interesting_files for LCA merge	Aaron Bentley	17 years ago
3144.5.2	Merge with fix-conflict-handling Merge with fix-conflict-handling	Aaron Bentley	17 years ago
3144.5.1	Add interesting files to file list Add interesting files to file list	Aaron Bentley	17 years ago
3144.3.8	Merge with bzr.dev Merge with bzr.dev	Aaron Bentley	17 years ago
3144.3.7	Update from review Update from review	Aaron Bentley	17 years ago
3144.3.6	Add documentation of LCA merge Add documentation of LCA merge	Aaron Bentley	17 years ago
3144.3.5	Add NEWS entry Add NEWS entry	Aaron Bentley	17 years ago
3144.3.4	Merge from bzr.dev Merge from bzr.dev	Aaron Bentley	17 years ago
3144.3.3	Update test for new conflicted types Update test for new conflicted types	Aaron Bentley	17 years ago
3144.3.2	Get conflict handling working Get conflict handling working	Aaron Bentley	17 years ago
3144.3.1	Implement LCA merge, with problematic conflict markers Implement LCA merge, with problematic conflict markers	Aaron Bentley	17 years ago
3144	Switch heading markers to use - instead of =, to fix auto-re... Switch heading markers to use - instead of =, to fix auto-resolve	Canonical.com Patch ...	17 years ago
3143	Add find_branch, find_trees, find_bzrdirs methods (abentley) Add find_branch, find_trees, find_bzrdirs methods (abentley)	Canonical.com Patch ...	17 years ago
3142	(Jelmer) No longer mark the rich-root-pack format as experim... (Jelmer) No longer mark the rich-root-pack format as experimental.	Canonical.com Patch ...	17 years ago
3141	(jam, (jam, tgerigk) Fix bug #175886: version_info_format deprecated function still needs to be tested	Canonical.com Patch ...	17 years ago
3140	Fix commit for a checkout sharing a repo with its branch (ab... Fix commit for a checkout sharing a repo with its branch (abentley, #177592)	Canonical.com Patch ...	17 years ago
3139	Fix build_tree acceleration when file is moved in accelerato... Fix build_tree acceleration when file is moved in accelerator_tree	Canonical.com Patch ...	17 years ago
3138	(andrew) Reduce lockdir timeout to 0 seconds in cmd_serve. (andrew) Reduce lockdir timeout to 0 seconds in cmd_serve.	Canonical.com Patch ...	17 years ago

Older »