Rev 4706: (mbp for garyvdm) Revert rename of in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4706 [merge]
revision-id: pqm at pqm.ubuntu.com-20090919003214-2dli9jc4y5xhjj3n
parent: pqm at pqm.ubuntu.com-20090918160454-ag1zd9txn44prlye
parent: garyvdm at gmail.com-20090915111341-hd0z4vhdcsgcwv45
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2009-09-19 01:32:14 +0100
message:
  (mbp for garyvdm) Revert rename of
  	test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.
modified:
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py	2009-09-18 15:08:09 +0000
+++ b/bzrlib/tests/test_merge.py	2009-09-19 00:32:14 +0000
@@ -284,8 +284,7 @@
         except AttributeError:
             self.fail('tried to join a path when name was None')
 
-
-    def test_merge_existing_limbo_or_pending_deletion(self):
+    def test_merge_uncommitted_otherbasis_ancestor_of_thisbasis(self):
         tree_a = self.make_branch_and_tree('a')
         self.build_tree(['a/file_1', 'a/file_2'])
         tree_a.add(['file_1'])