← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-04 16:06:36 UTC
  • mfrom: (5007 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100204160636-xqeuwz8bwt8bbts4
Merge bzr.dev 5007, resolve conflict, update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1904
1904
            # revision_id is set. We must check for this full string, because a
1905
1905
            # root node id can legitimately look like 'revision_id' but cannot
1906
1906
            # contain a '"'.
1907
 
            xml = self.branch.repository.get_inventory_xml(new_revision)
 
1907
            xml = self.branch.repository._get_inventory_xml(new_revision)
1908
1908
            firstline = xml.split('\n', 1)[0]
1909
1909
            if (not 'revision_id="' in firstline or
1910
1910
                'format="7"' not in firstline):