← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/intertree_implementations/test_compare.py

  • Committer: Aaron Bentley
  • Date: 2006-11-17 04:06:03 UTC
  • mfrom: (2139 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2162.
  • Revision ID: aaron.bentley@utoronto.ca-20061117040603-pgebxndswvwk26tt
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/intertree_implementations/test_compare.py
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 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
270
270
        tree1 = self.get_tree_no_parents_no_content(tree1)
271
271
        tree2 = self.get_to_tree_no_parents_abc_content(tree2)
272
272
            
273
 
        self.assertEqual([self.added(tree2, 'a-id'), 
 
273
        self.assertEqual([self.added(tree2, 'root-id'),
 
274
                          self.added(tree2, 'a-id'), 
274
275
                          self.added(tree2, 'b-id'), 
275
 
                          self.added(tree2, 'c-id')],
 
276
                          self.added(tree2, 'c-id'),
 
277
                          self.deleted(tree1, 'empty-root-id')],
276
278
                         list(tree2.iter_changes(tree1)))
277
279
 
278
280
    def test_empty_to_abc_content_a_only(self):
312
314
                    (entry.parent_id, None),
313
315
                    (entry.name, None), (entry.kind, None), 
314
316
                    (entry.executable, None))
315
 
            
316
 
        self.assertEqual([deleted('a-id'), deleted('b-id'), deleted('c-id')],
317
 
                         list(tree1.iter_changes(tree2)))
 
317
        self.assertEqual([self.added(tree1, 'empty-root-id'), 
 
318
                          deleted('root-id'), deleted('a-id'), 
 
319
                          deleted('b-id'), deleted('c-id')],
 
320
                          list(tree1.iter_changes(tree2)))
318
321
 
319
322
    def test_content_modification(self):
320
323
        tree1 = self.make_branch_and_tree('1')