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

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

From Revision 4869.3.9 to 4863

Rev	Summary	Authors	Date
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
4869.2.4	Delete some unused imports in test_merge_core. Delete some unused imports in test_merge_core.	Andrew Bennetts	15 years ago
4869.2.3	Delete some unused imports in test_merge. Delete some unused imports in test_merge.	Andrew Bennetts	15 years ago
4869.2.2	Remove some duplication. Remove some duplication.	Andrew Bennetts	15 years ago
4869.2.1	Trivial improvements to bzrlib/merge.py suggested by pyflake... Trivial improvements to bzrlib/merge.py suggested by pyflakes.	Andrew Bennetts	15 years ago
4869	(andrew) Allow '--hardlink' of files from 2a trees for any f... (andrew) Allow '--hardlink' of files from 2a trees for any file that is unfiltered. (#408193)	Canonical.com Patch ...	15 years ago
4868	(igc) Fix logging too much (Marius Kruger, #325618, #484109) (igc) Fix logging too much (Marius Kruger, #325618, #484109)	Canonical.com Patch ...	15 years ago
4867	(igc) Fix UG broken link to bug trackers (Patrick Regan) (igc) Fix UG broken link to bug trackers (Patrick Regan)	Canonical.com Patch ...	15 years ago
4866	(vila) Start fixing bug #395714 when authentication is requi... (vila) Start fixing bug #395714 when authentication is required after an http redirection	Canonical.com Patch ...	15 years ago
4865	(jam) Update a couple tests so that they clean themselves up... (jam) Update a couple tests so that they clean themselves up properly.	Canonical.com Patch ...	15 years ago
4864	(vila) Fix a test timing-dependency issue (vila) Fix a test timing-dependency issue	Canonical.com Patch ...	15 years ago
4863	(vila) BZR_COLUMNS can override terminal_width() (vila) BZR_COLUMNS can override terminal_width()	Canonical.com Patch ...	15 years ago

Older »