← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2795
2795
 
2796
2796
    case_sensitive_filename = "FoRMaT"
2797
2797
 
 
2798
    missing_parent_conflicts = False
 
2799
    """If this format supports missing parent conflicts."""
 
2800
 
2798
2801
    @classmethod
2799
2802
    def find_format(klass, a_bzrdir):
2800
2803
        """Return the format for the working tree object in a_bzrdir."""
2883
2886
 
2884
2887
    upgrade_recommended = True
2885
2888
 
 
2889
    missing_parent_conflicts = True
 
2890
 
2886
2891
    def get_format_string(self):
2887
2892
        """See WorkingTreeFormat.get_format_string()."""
2888
2893
        return "Bazaar-NG Working Tree format 3"