← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 03:04:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124030458-aj2syolemmi6knri
Fix more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1365
1365
            base_tree = trees[0][1]
1366
1366
        state = self.current_dirstate()
1367
1367
        # We don't support ghosts yet
1368
 
        state.set_state_from_scratch(base_tree.inventory, trees, [])
 
1368
        state.set_state_from_scratch(base_tree.root_inventory, trees, [])
1369
1369
 
1370
1370
 
1371
1371
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1997
1997
            inv = self.root_inventory
1998
1998
            from_dir_id = None
1999
1999
        else:
2000
 
            inv, from_dir_id = inv._path2inv_file_id(from_dir)
 
2000
            inv, from_dir_id = self._path2inv_file_id(from_dir)
2001
2001
            if from_dir_id is None:
2002
2002
                # Directory not versioned
2003
2003
                return