Rev 2467: Add a (failing) test for bug 111127 in http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/mixed_names_111127

John Arbash Meinel john at arbash-meinel.com
Mon Apr 30 17:09:08 BST 2007


At http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/mixed_names_111127

------------------------------------------------------------
revno: 2467
revision-id: john at arbash-meinel.com-20070430160855-z8zh7eb7r629ch6g
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mixed_names_111127
timestamp: Mon 2007-04-30 11:08:55 -0500
message:
  Add a (failing) test for bug 111127
modified:
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
-------------- next part --------------
=== modified file 'bzrlib/tests/intertree_implementations/test_compare.py'
--- a/bzrlib/tests/intertree_implementations/test_compare.py	2007-04-25 22:45:55 +0000
+++ b/bzrlib/tests/intertree_implementations/test_compare.py	2007-04-30 16:08:55 +0000
@@ -867,6 +867,34 @@
             specific_files=specific_files, require_versioned=False,
             want_unversioned=True))
 
+    def test_similar_filenames(self):
+        """Test when we have a few files with similar names."""
+        tree1 = self.make_branch_and_tree('tree1')
+        tree2 = self.make_branch_and_tree('tree2')
+        tree2.set_root_id(tree1.get_root_id())
+
+        # The trees are actually identical, but they happen to contain
+        # similarly named files.
+        self.build_tree(['tree1/a/',
+                         'tree1/a/b/',
+                         'tree1/a-c/',
+                         'tree1/a-c/d/',
+                         'tree2/a/',
+                         'tree2/a/b/',
+                         'tree2/a-c/',
+                         'tree2/a-c/d/',
+                        ])
+        tree1.add(['a', 'a/b', 'a-c', 'a-c/d'],
+                  ['a-id', 'b-id', 'a-c-id', 'd-id'])
+        tree2.add(['a', 'a/b', 'a-c', 'a-c/d'],
+                  ['a-id', 'b-id', 'a-c-id', 'd-id'])
+
+        tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
+
+        self.assertEqual([], self.do_iter_changes(tree1, tree2,
+                                                  want_unversioned=True))
+
+
     def test_unversioned_subtree_only_emits_root(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')



More information about the bazaar-commits mailing list