← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2010-01-29 10:36:23 UTC
  • mto: This revision was merged to the branch mainline in revision 4992.
  • Revision ID: mbp@sourcefrog.net-20100129103623-hywka5hymo5z13jw
Change url to canonical.com or wiki, plus some doc improvements in passing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
111
111
 
112
112
 
113
113
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
114
 
# TODO: Modifying the conflict objects or their type is currently nearly
115
 
# impossible as there is no clear relationship between the working tree format
116
 
# and the conflict list file format.
117
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
118
115
 
119
116
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
1907
1904
            # revision_id is set. We must check for this full string, because a
1908
1905
            # root node id can legitimately look like 'revision_id' but cannot
1909
1906
            # contain a '"'.
1910
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1907
            xml = self.branch.repository.get_inventory_xml(new_revision)
1911
1908
            firstline = xml.split('\n', 1)[0]
1912
1909
            if (not 'revision_id="' in firstline or
1913
1910
                'format="7"' not in firstline):