← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_tree.py

  • Committer: John Arbash Meinel
  • Date: 2009-09-02 13:32:52 UTC
  • mfrom: (4634.6.14 2.0)
  • mto: (4634.6.15 2.0)
  • mto: This revision was merged to the branch mainline in revision 4667.
  • Revision ID: john@arbash-meinel.com-20090902133252-t2t94xtckoliv2th
Merge lp:bzr/2.0 to resolve NEWS issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tree.py
123
123
        wt = self.make_branch_and_tree('.')
124
124
        delta = wt.changes_from(wt.basis_tree())
125
125
        self.assertEqual(len(delta.added), 0)
126
 
        delta = wt.changes_from(wt.basis_tree(), wt, include_root=True)
 
126
        delta = wt.changes_from(wt.basis_tree(), include_root=True)
127
127
        self.assertEqual(len(delta.added), 1)
128
128
        self.assertEqual(delta.added[0][0], '')
129
129
 
139
139
 
140
140
        # we need to pass a known file with an unknown file to get this to
141
141
        # fail when expected.
142
 
        delta = wt.changes_from(wt.basis_tree(), wt,
 
142
        delta = wt.changes_from(wt.basis_tree(),
143
143
            specific_files=['known_file', 'unknown_file'] ,
144
144
            require_versioned=False)
145
145
        self.assertEqual(len(delta.added), 1)