← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 4869.3.15 to 4869

expand all expand all

Rev   Summary Authors Date Diff Files
4869.3.15
Refactor so that the default text merge is the final hook tr...
Andrew Bennetts 14 years ago Diff Files
4869.3.14
Fix bug that would leave an unversioned file behind when a h...
Andrew Bennetts 14 years ago Diff Files
4869.3.13
Add simple cachedproperty decorator, and add {this,other,bas...
Andrew Bennetts 14 years ago Diff Files
4869.3.12
Tidy up stray comment and some line wrapping.
Andrew Bennetts 14 years ago Diff Files
4869.3.11
More docs.
Andrew Bennetts 14 years ago Diff Files
4869.3.10
Add more tests.
Andrew Bennetts 14 years ago Diff Files
4869.3.9
Document hook point better
Andrew Bennetts 14 years ago Diff Files
4869.3.8
Merge merge-minor-refactoring.
Andrew Bennetts 14 years ago Diff Files
4869.3.7
Merge merge-minor-refactoring.
Andrew Bennetts 14 years ago Diff Files
4869.3.6
Add more tests.
Andrew Bennetts 14 years ago Diff Files
4869.3.5
Hook is invoked for delete vs. change conflicts, and may cho...
Andrew Bennetts 14 years ago Diff Files
4869.3.4
Add Merger.hooks to the global known_hooks.
Andrew Bennetts 14 years ago Diff Files
4869.3.3
Move test_hook_merge_file_content to per_merger.
Andrew Bennetts 14 years ago Diff Files
4869.3.2
Merge per_merger tests from merge-minor-refactoring.
Andrew Bennetts 14 years ago Diff Files
4869.3.1
Basic per-file merge hook.
Andrew Bennetts 14 years ago Diff Files
4869.2.4
Delete some unused imports in test_merge_core.
Andrew Bennetts 14 years ago Diff Files
4869.2.3
Delete some unused imports in test_merge.
Andrew Bennetts 14 years ago Diff Files
4869.2.2
Remove some duplication.
Andrew Bennetts 14 years ago Diff Files
4869.2.1
Trivial improvements to bzrlib/merge.py suggested by pyflake...
Andrew Bennetts 14 years ago Diff Files
4869
(andrew) Allow '--hardlink' of files from 2a trees for any f...
Canonical.com Patch ... 14 years ago Diff Files