← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-10 07:46:15 UTC
  • mfrom: (5844 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5845.
  • Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/workingtree.py
30
30
from bzrlib.decorators import needs_read_lock
31
31
from bzrlib.transport.local import LocalTransport
32
32
from bzrlib.workingtree import (
 
33
    InventoryWorkingTree,
33
34
    WorkingTreeFormat,
34
 
    WorkingTree,
35
35
    )
36
36
 
37
37
 
133
133
        return wt
134
134
 
135
135
 
136
 
class WorkingTree2(WorkingTree):
 
136
class WorkingTree2(InventoryWorkingTree):
137
137
    """This is the Format 2 working tree.
138
138
 
139
139
    This was the first weave based working tree.
227
227
                             file_id=self.path2id(conflicted)))
228
228
        return conflicts
229
229
 
 
230
    def set_conflicts(self, arg):
 
231
        raise errors.UnsupportedOperation(self.set_conflicts, self)
230
232
 
 
233
    def add_conflicts(self, arg):
 
234
        raise errors.UnsupportedOperation(self.add_conflicts, self)