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

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

Rev	Summary	Authors	Date
4869.3.27	Move news_merge plugin from contrib to bzrlib/plugins, chang... Move news_merge plugin from contrib to bzrlib/plugins, change it to be enabled via a 'news_merge_files' config option, move more code out of the __init__ to minimise overhead, and add lots of docstrings, add NEWS entry.	Andrew Bennetts	15 years ago
4869.3.26	Fix problem with lazy_importing a submodule of this module. Fix problem with lazy_importing a submodule of this module.	Andrew Bennetts	15 years ago
4869.3.25	Use 2.4 syntax and lazy_import in news_merge plugin. Use 2.4 syntax and lazy_import in news_merge plugin.	Andrew Bennetts	15 years ago
4869.3.24	Mention 'winner' attribute in MergeHookParams' docstring. Mention 'winner' attribute in MergeHookParams' docstring.	Andrew Bennetts	15 years ago
4869.3.23	Remove some confusing code that has no effect. Remove some confusing code that has no effect.	Andrew Bennetts	15 years ago
4869.3.22	Use 'tree.has_id(file_id)' rather than using 'file_id in tre... Use 'tree.has_id(file_id)' rather than using 'file_id in tree' or using tree.inventory.	Andrew Bennetts	15 years ago
4869.3.21	Pass kinds (not pairs) to MergeHookParams. Pass kinds (not pairs) to MergeHookParams.	Andrew Bennetts	15 years ago
4869.3.20	Merge lp:bzr. Merge lp:bzr.	Andrew Bennetts	15 years ago
4869.3.19	Merge news_merge example. Merge news_merge example.	Andrew Bennetts	15 years ago
4869.3.18	Simplify slightly more. Simplify slightly more.	Andrew Bennetts	15 years ago
4869.3.17	Remove contents_conflict nested function, replace last calls... Remove contents_conflict nested function, replace last callsite with simpler form.	Andrew Bennetts	15 years ago
4869.3.16	Move handling of winner==OTHER case into generic hook path t... Move handling of winner==OTHER case into generic hook path too.	Andrew Bennetts	15 years ago
4869.3.15	Refactor so that the default text merge is the final hook tr... Refactor so that the default text merge is the final hook tried. Other hooks can now invoke it directly via merger.default_text_merge if they wish.	Andrew Bennetts	15 years ago
4869.3.14	Fix bug that would leave an unversioned file behind when a h... Fix bug that would leave an unversioned file behind when a hook asks for a deletion.	Andrew Bennetts	15 years ago
4869.3.13	Add simple cachedproperty decorator, and add {this,other,bas... Add simple cachedproperty decorator, and add {this,other,base}_lines cachedproperties to MergeHookParams.	Andrew Bennetts	15 years ago
4869.3.12	Tidy up stray comment and some line wrapping. Tidy up stray comment and some line wrapping.	Andrew Bennetts	15 years ago
4869.3.11	More docs. More docs.	Andrew Bennetts	15 years ago
4869.3.10	Add more tests. Add more tests.	Andrew Bennetts	15 years ago
4869.3.9	Document hook point better Document hook point better	Andrew Bennetts	15 years ago
4869.3.8	Merge merge-minor-refactoring. Merge merge-minor-refactoring.	Andrew Bennetts	15 years ago

Older »