« back to all changes in this revision
Viewing changes to bzrlib/revisionspec.py
- Committer: Vincent Ladeuil
- Date: 2010-02-08 16:36:13 UTC
- mto: (5029.2.1 integration2)
- mto: This revision was merged to the branch mainline in revision 5031.
- Revision ID: v.ladeuil+lp@free.fr-20100208163613-9sgl3ugvdxapwgw8
``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.
* 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.
- files added:
- bzrlib/weave_commands.py
- files removed:
- .testr.conf
- bzrlib/tests/per_bzrdir_colo
- doc/en/whats-new
- files renamed:
- apport/ => contrib/apport/
- apport/bzr-crashdb.conf => contrib/apport/bzr.conf
- files modified:
- .bzrignore
added
removed
bzrlib/revisionspec.py
