← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-02-12 13:59:44 UTC
  • mfrom: (5661.1.1 missing-parent-conflicts)
  • Revision ID: pqm@pqm.ubuntu.com-20110212135944-g60tp8iryf0m620i
(jelmer) Add a WorkingTreeFormat.missing_parent_conflicts flag. (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2893
2893
 
2894
2894
    case_sensitive_filename = "FoRMaT"
2895
2895
 
 
2896
    missing_parent_conflicts = False
 
2897
    """If this format supports missing parent conflicts."""
 
2898
 
2896
2899
    @classmethod
2897
2900
    def find_format(klass, a_bzrdir):
2898
2901
        """Return the format for the working tree object in a_bzrdir."""
2979
2982
 
2980
2983
    case_sensitive_filename = "Branch-FoRMaT"
2981
2984
 
 
2985
    missing_parent_conflicts = False
 
2986
 
2982
2987
    def get_format_description(self):
2983
2988
        """See WorkingTreeFormat.get_format_description()."""
2984
2989
        return "Working tree format 2"
3069
3074
 
3070
3075
    upgrade_recommended = True
3071
3076
 
 
3077
    missing_parent_conflicts = True
 
3078
 
3072
3079
    def get_format_string(self):
3073
3080
        """See WorkingTreeFormat.get_format_string()."""
3074
3081
        return "Bazaar-NG Working Tree format 3"