~abentley/bzr/appenddir

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.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:
1406
1406
 
1407
1407
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1408
1408
 
 
1409
    missing_parent_conflicts = True
 
1410
 
1409
1411
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1410
1412
                   accelerator_tree=None, hardlink=False):
1411
1413
        """See WorkingTreeFormat.initialize().