/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/blackbox/test_merge.py

  • Committer: INADA Naoki
  • Date: 2011-05-18 06:27:34 UTC
  • mfrom: (5887 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5894.
  • Revision ID: songofacandy@gmail.com-20110518062734-1ilhll0rrqyyp8um
merge from lp:bzr and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
555
555
        self.assertEqual(tree_b.branch.get_submit_branch(),
556
556
                         tree_a.bzrdir.root_transport.base)
557
557
 
 
558
    def test_no_remember_dont_set_submit(self):
 
559
        tree_a = self.make_branch_and_tree('a')
 
560
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
561
        self.assertIs(tree_b.branch.get_submit_branch(), None)
 
562
 
 
563
        # Remember should not happen if using default from parent
 
564
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember'])
 
565
        self.assertEquals(None, tree_b.branch.get_submit_branch())
 
566
 
 
567
        # Remember should not happen if user supplies location but ask for not
 
568
        # remembering it
 
569
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember', 'a'])
 
570
        self.assertEqual(None, tree_b.branch.get_submit_branch())
 
571
 
558
572
    def test_weave_cherrypick(self):
559
573
        this_tree = self.make_branch_and_tree('this')
560
574
        self.build_tree_contents([('this/file', "a\n")])