← 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: John Arbash Meinel
  • Date: 2011-05-06 15:15:44 UTC
  • mfrom: (5835 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110506151544-atzxeezfwssnlacr
Merge bzr.dev 5835 in prep for release-notes updates

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)