/brz/remove-bazaar : changes

» Changes from revision 3144.3.6

To get this branch, use:

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

From Revision 3144.3.6 to 3131

expand all

Rev	Summary	Authors	Date
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
3137	(vila) Fix bug #177643 by handling credentials embedded in u... (vila) Fix bug #177643 by handling credentials embedded in urls works again for pycurl	Canonical.com Patch ...	17 years ago
3136	Enhance accelerator_tree tests (abentley) Enhance accelerator_tree tests (abentley)	Canonical.com Patch ...	17 years ago
3135	Accelerate build_tree using similar workingtrees (abentley) Accelerate build_tree using similar workingtrees (abentley)	Canonical.com Patch ...	17 years ago
3134	(jam) re-enable the fast _iter_changes versus the null revis... (jam) re-enable the fast _iter_changes versus the null revision.	Canonical.com Patch ...	17 years ago
3133	Annotate merge can do cherrypicks (abentley) Annotate merge can do cherrypicks (abentley)	Canonical.com Patch ...	17 years ago
3132	Warn when merge directives cause cherrypicks (abentley) Warn when merge directives cause cherrypicks (abentley)	Canonical.com Patch ...	17 years ago
3131	(jam) allow _patience_diff_c to support any object that supp... (jam) allow _patience_diff_c to support any object that supports hash()	Canonical.com Patch ...	17 years ago

Older »