← 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: Canonical.com Patch Queue Manager
  • Date: 2011-05-05 03:14:25 UTC
  • mfrom: (5816.5.7 workingtree-3)
  • Revision ID: pqm@pqm.ubuntu.com-20110505031425-f1pyxrpf6wu8jads
(jelmer) Split WorkingTree3 out into a separate file. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/workingtree.py
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)