/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-19 00:32:14 UTC
  • mfrom: (4685.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090919003214-2dli9jc4y5xhjj3n
(mbp for garyvdm) Revert rename of
        test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
284
284
        except AttributeError:
285
285
            self.fail('tried to join a path when name was None')
286
286
 
287
 
 
288
 
    def test_merge_existing_limbo_or_pending_deletion(self):
 
287
    def test_merge_uncommitted_otherbasis_ancestor_of_thisbasis(self):
289
288
        tree_a = self.make_branch_and_tree('a')
290
289
        self.build_tree(['a/file_1', 'a/file_2'])
291
290
        tree_a.add(['file_1'])