← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-29 21:35:05 UTC
  • mfrom: (4576 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4577.
  • Revision ID: john@arbash-meinel.com-20090729213505-tkqsvy1zfpocu75w
Merge bzr.dev 4576 in prep for NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
582
582
        self.addCleanup(this_tree.unlock)
583
583
        self.assertEqual([],
584
584
                         list(this_tree.iter_changes(this_tree.basis_tree())))
 
585
 
 
586
    def test_merge_missing_second_revision_spec(self):
 
587
        """Merge uses branch basis when the second revision is unspecified."""
 
588
        this = self.make_branch_and_tree('this')
 
589
        this.commit('rev1')
 
590
        other = self.make_branch_and_tree('other')
 
591
        self.build_tree(['other/other_file'])
 
592
        other.add('other_file')
 
593
        other.commit('rev1b')
 
594
        self.run_bzr('merge -d this other -r0..')
 
595
        self.failUnlessExists('this/other_file')