← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Alexander Belchenko
  • Date: 2007-06-06 07:45:14 UTC
  • mfrom: (2511 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2512.
  • Revision ID: bialix@ukr.net-20070606074514-qq7bxr0x2uj8c5c2
merge bzr.dev; fix ReST formatting in planned-performance-changes.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
249
249
        registry.remove('merge4')
250
250
        self.assertFalse('merge4' in [x[0] for x in 
251
251
                        merge_type_option.iter_switches()])
 
252
 
 
253
    def test_merge_other_moves_we_deleted(self):
 
254
        tree_a = self.make_branch_and_tree('A')
 
255
        tree_a.lock_write()
 
256
        self.addCleanup(tree_a.unlock)
 
257
        self.build_tree(['A/a'])
 
258
        tree_a.add('a')
 
259
        tree_a.commit('1', rev_id='rev-1')
 
260
        tree_a.flush()
 
261
        tree_a.rename_one('a', 'b')
 
262
        tree_a.commit('2')
 
263
        bzrdir_b = tree_a.bzrdir.sprout('B', revision_id='rev-1')
 
264
        tree_b = bzrdir_b.open_workingtree()
 
265
        tree_b.lock_write()
 
266
        self.addCleanup(tree_b.unlock)
 
267
        os.unlink('B/a')
 
268
        tree_b.commit('3')
 
269
        try:
 
270
            tree_b.merge_from_branch(tree_a.branch)
 
271
        except AttributeError:
 
272
            self.fail('tried to join a path when name was None')