← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2006-04-05 04:29:35 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: aaron.bentley@utoronto.ca-20060405042935-7a86762d00a3ae2e
Got all tests passing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
50
50
from bzrlib.atomicfile import AtomicFile
51
51
from bzrlib.branch import (Branch,
52
52
                           quotefn)
53
 
from bzrlib.conflicts import (stanza_conflicts, conflict_stanzas,
 
53
from bzrlib.conflicts import (stanza_conflicts, conflict_stanzas, Conflict,
54
54
                              CONFLICT_SUFFIXES)
55
55
import bzrlib.bzrdir as bzrdir
56
56
from bzrlib.decorators import needs_read_lock, needs_write_lock
1316
1316
                        text = False
1317
1317
                        break
1318
1318
            ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1319
 
            yield (ctype, self.path2id(conflicted), conflicted)
 
1319
            yield Conflict.factory(ctype, path=conflicted, 
 
1320
                                   file_id=self.path2id(conflicted))
1320
1321
 
1321
1322
class WorkingTree3(WorkingTree):
1322
1323
    """This is the Format 3 working tree.