← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
69
69
from copy import copy
70
70
from cStringIO import StringIO
71
71
import os
 
72
import time
 
73
import warnings
72
74
 
73
75
from bzrlib.lazy_import import lazy_import
74
76
lazy_import(globals(), """
77
79
from bzrlib import (
78
80
    errors,
79
81
    osutils,
 
82
    progress,
80
83
    )
81
84
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
82
85
        RevisionAlreadyPresent,
83
86
        RevisionNotPresent,
84
87
        UnavailableRepresentation,
 
88
        WeaveRevisionAlreadyPresent,
 
89
        WeaveRevisionNotPresent,
85
90
        )
86
91
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
87
92
import bzrlib.patiencediff