/brz/remove-bazaar : changes

» Changes from revision 5013.2.5

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

From Revision 5013.2.5 to 4999

expand all

Rev	Summary	Authors	Date
5013.2.5	Use a set() for conflicts_related to stay O(1). Use a set() for conflicts_related to stay O(1).	Vincent Ladeuil	15 years ago
5013.2.4	``bzr add`` won't blindly add conflict related files. ``bzr add`` won't blindly add conflict related files. * bzrlib/tests/per_workingtree/test_smart_add.py: (TestSmartAddConflictRelatedFiles): Make sure we don't add blindly but that we can add on demand. * bzrlib/mutabletree.py: (MutableTree.smart_add): Check that we don't, implicitly, add a file generated to help resolve a conflict. * bzrlib/conflicts.py: (Conflict.associated_filenames): New helper. (Conflict.cleanup): Use the helper to reduce duplication. (PathConflict, ContentsConflict, TextConflict, HandledConflict): Define associated_filenames instead of cleanup.	Vincent Ladeuil	15 years ago
5013.2.3	Simplify some tests in per_workingtree/test_smart_add.py. Simplify some tests in per_workingtree/test_smart_add.py.	Vincent Ladeuil	15 years ago
5013.2.2	Fix imports in per_workingtree/test_smart_add.py. Fix imports in per_workingtree/test_smart_add.py.	Vincent Ladeuil	15 years ago
5013.2.1	Fix imports in test_smart_add.py. Fix imports in test_smart_add.py.	Vincent Ladeuil	15 years ago
5013	(vila) (trivial) Fix imports in blackbox/test_add.py (vila) (trivial) Fix imports in blackbox/test_add.py	Canonical.com Patch ...	15 years ago
5012	(mbp) fix --profile-imports on python2.6 (mbp) fix --profile-imports on python2.6	Canonical.com Patch ...	15 years ago
5011	(mbp) change cmd_uncommit to use UIFactory more (mbp) change cmd_uncommit to use UIFactory more	Canonical.com Patch ...	15 years ago
5010	(vila)(trivial) Fix typos (vila)(trivial) Fix typos	Canonical.com Patch ...	15 years ago
5009	(vila) Add --take-this and --take-other actions to bzr resol... (vila) Add --take-this and --take-other actions to bzr resolve	Canonical.com Patch ...	15 years ago
5008	(mbp) developer doc tweaks (mbp) developer doc tweaks	Canonical.com Patch ...	15 years ago
5007	(vila) Avoid infinite recursion when probing for apport (vila) Avoid infinite recursion when probing for apport	Canonical.com Patch ...	15 years ago
5006	(doxxx) Change the units displayed for transport activity an... (doxxx) Change the units displayed for transport activity and debug memory	Canonical.com Patch ...	15 years ago
5005	(mbp) revert turning off apport in cmd_selftest (mbp) revert turning off apport in cmd_selftest	Canonical.com Patch ...	15 years ago
5004	(nmb) Better error message for bzr bind on and already bound... (nmb) Better error message for bzr bind on and already bound branch	Canonical.com Patch ...	15 years ago
5003	(mbp) turn off selftest globally in cmd_selftest (mbp) turn off selftest globally in cmd_selftest	Canonical.com Patch ...	15 years ago
5002	(mbp) use apport to send bugs, not just store them (mbp) use apport to send bugs, not just store them	Canonical.com Patch ...	15 years ago
5001	(vila) Fix ``log`` to better check ancestors even if merged ... (vila) Fix ``log`` to better check ancestors even if merged revisions are involved	Canonical.com Patch ...	15 years ago
5000	(vila) Merge 2.1 to trunk, (vila) Merge 2.1 to trunk, including fix for bug #515597 (per-file merge hook typo)	Canonical.com Patch ...	15 years ago
4999	(mbp) remove contrib/fortune (mbp) remove contrib/fortune	Canonical.com Patch ...	15 years ago

Older »