← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2006-08-23 04:25:06 UTC
  • mto: (1910.2.43 format-bumps)
  • mto: This revision was merged to the branch mainline in revision 1997.
  • Revision ID: aaron.bentley@utoronto.ca-20060823042506-98adf009e8bd90d1
Make commits preserve root entry data

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1250
1250
            # root node id can legitimately look like 'revision_id' but cannot
1251
1251
            # contain a '"'.
1252
1252
            xml = self.branch.repository.get_inventory_xml(new_revision)
1253
 
            if not 'revision_id="' in xml.split('\n', 1)[0]:
 
1253
            firstline = xml.split('\n', 1)[0]
 
1254
            if (not 'revision_id="' in firstline or 
 
1255
                'format="5"' not in firstline):
1254
1256
                inv = self.branch.repository.deserialise_inventory(
1255
1257
                    new_revision, xml)
1256
1258
                inv.revision_id = new_revision