← 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: Vincent Ladeuil
  • Date: 2011-09-09 13:30:12 UTC
  • mfrom: (5609.48.11 2.3)
  • mto: (6015.33.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6134.
  • Revision ID: v.ladeuil+lp@free.fr-20110909133012-jc1d1zyqgak57123
Merge 2.3 into 2.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tree.py
1
 
# Copyright (C) 2006, 2008 Canonical Ltd
 
1
# Copyright (C) 2006-2009, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
19
19
from bzrlib import (
20
20
    errors,
21
21
    revision,
22
 
    tests,
23
22
    tree as _mod_tree,
24
23
    )
25
24
from bzrlib.tests import TestCaseWithTransport
123
122
        wt = self.make_branch_and_tree('.')
124
123
        delta = wt.changes_from(wt.basis_tree())
125
124
        self.assertEqual(len(delta.added), 0)
126
 
        delta = wt.changes_from(wt.basis_tree(), wt, include_root=True)
 
125
        delta = wt.changes_from(wt.basis_tree(), include_root=True)
127
126
        self.assertEqual(len(delta.added), 1)
128
127
        self.assertEqual(delta.added[0][0], '')
129
128
 
139
138
 
140
139
        # we need to pass a known file with an unknown file to get this to
141
140
        # fail when expected.
142
 
        delta = wt.changes_from(wt.basis_tree(), wt,
 
141
        delta = wt.changes_from(wt.basis_tree(),
143
142
            specific_files=['known_file', 'unknown_file'] ,
144
143
            require_versioned=False)
145
144
        self.assertEqual(len(delta.added), 1)