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

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

Rev	Summary	Authors	Date
4869.3.20	Merge lp:bzr. Merge lp:bzr.	Andrew Bennetts	14 years ago
4869.3.19	Merge news_merge example. Merge news_merge example.	Andrew Bennetts	14 years ago
4869.3.18	Simplify slightly more. Simplify slightly more.	Andrew Bennetts	14 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	14 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	14 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	14 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	14 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
4869.3.7	Merge merge-minor-refactoring. Merge merge-minor-refactoring.	Andrew Bennetts	15 years ago
4869.3.6	Add more tests. Add more tests.	Andrew Bennetts	15 years ago
4869.3.5	Hook is invoked for delete vs. change conflicts, and may cho... Hook is invoked for delete vs. change conflicts, and may choose to result in deleting the file.	Andrew Bennetts	15 years ago
4869.3.4	Add Merger.hooks to the global known_hooks. Add Merger.hooks to the global known_hooks.	Andrew Bennetts	15 years ago
4869.3.3	Move test_hook_merge_file_content to per_merger. Move test_hook_merge_file_content to per_merger.	Andrew Bennetts	15 years ago
4869.3.2	Merge per_merger tests from merge-minor-refactoring. Merge per_merger tests from merge-minor-refactoring.	Andrew Bennetts	15 years ago
4869.3.1	Basic per-file merge hook. Basic per-file merge hook.	Andrew Bennetts	15 years ago

Older »