← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-04 08:49:15 UTC
  • mfrom: (5818 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5819.
  • Revision ID: jelmer@samba.org-20110504084915-05bjgkllosui58o9
Merge bzr.dev, resolve conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2978
2978
        return self._default_format
2979
2979
 
2980
2980
    def set_default(self, format):
 
2981
        """Set the default format."""
2981
2982
        self._default_format = format
2982
2983
        self._default_format_key = None
2983
2984
 
2984
2985
    def set_default_key(self, format_string):
 
2986
        """Set the default format by its format string."""
2985
2987
        self._default_format_key = format_string
2986
2988
        self._default_format = None
2987
2989