← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 3144.6.1 to 3138

expand all expand all

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