← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-06 07:36:16 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20061006073616-c9a36866b39fce47
make bzrlib/conflicts.py lazy

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2005, 2006 by Canonical Ltd
 
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
86
86
            inv.add_path(*args)
87
87
 
88
88
        self.assertEqual([
 
89
            ('', ROOT_ID),
89
90
            ('Makefile', 'makefile-id'),
90
91
            ('doc', 'doc-id'),
91
92
            ('src', 'src-id'),
108
109
            inv.add_path(*args)
109
110
 
110
111
        self.assertEqual([
 
112
            ('', ROOT_ID),
111
113
            ('Makefile', 'makefile-id'),
112
114
            ('doc', 'doc-id'),
113
115
            ('src', 'src-id'),
432
434
        self.assertEqual(self.branch.revision_history(), ['A'])
433
435
        self.wt.commit('another add of file', rev_id='C')
434
436
        self.inv_C = self.branch.repository.get_inventory('C')
435
 
        self.wt.add_pending_merge('B')
 
437
        self.wt.add_parent_tree_id('B')
436
438
        self.wt.commit('merge in B', rev_id='D')
437
439
        self.inv_D = self.branch.repository.get_inventory('D')
438
440
        self.file_active = self.wt.inventory['fileid']