← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 5246.2.34 to 5246.2.15

expand all expand all

Rev   Summary Authors Date Diff Files
5246.2.34
Delete test_merge_into, and put those tests directly in test...
Andrew Bennetts 14 years ago Diff Files
5246.2.33
Rename _finish_transform to _finish_computing_transform.
Andrew Bennetts 14 years ago Diff Files
5246.2.32
Rename _Wrapper to _MergeTypeParameterizer.
Andrew Bennetts 14 years ago Diff Files
5246.2.31
Merge lp:bzr/2.2.
Andrew Bennetts 14 years ago Diff Files
5246.2.30
Rename Merge3MergeIntoMerger to MergeIntoMergeType.
Andrew Bennetts 14 years ago Diff Files
5246.2.29
Improve some docstrings.
Andrew Bennetts 14 years ago Diff Files
5246.2.28
Improve some docstrings.
Andrew Bennetts 14 years ago Diff Files
5246.2.27
Remove merge_into_helper for now, as it currently has no cal...
Andrew Bennetts 14 years ago Diff Files
5246.2.26
Remove cmd_merge_into until we decide what UI (if any) to pr...
Andrew Bennetts 14 years ago Diff Files
5246.2.25
Add another blackbox test, rename Wrapper to _Wrapper, and d...
Andrew Bennetts 14 years ago Diff Files
5246.2.24
Add test for another error case.
Andrew Bennetts 14 years ago Diff Files
5246.2.23
Fix XXX by adding a test for that case, and don't use Assert...
Andrew Bennetts 14 years ago Diff Files
5246.2.22
Minor tweaks.
Andrew Bennetts 14 years ago Diff Files
5246.2.21
Merge lp:bzr.
Andrew Bennetts 14 years ago Diff Files
5246.2.20
Tweak comments, add NEWS entry.
Andrew Bennetts 14 years ago Diff Files
5246.2.19
Trivial test name tweak.
Andrew Bennetts 14 years ago Diff Files
5246.2.18
Fix traceback if source path does not exist.
Andrew Bennetts 14 years ago Diff Files
5246.2.17
Merge lp:bzr.
Andrew Bennetts 14 years ago Diff Files
5246.2.16
Remove obsolete XXX.
Andrew Bennetts 14 years ago Diff Files
5246.2.15
Lazy import most things in merge.py, to minimise the impact ...
Andrew Bennetts 14 years ago Diff Files