← 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: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
176
176
        
177
177
        base = urlutils.local_path_from_url(branch_a.base)
178
178
        self.assertStartsWith(err,
179
 
                          'Merging from remembered location %s\n' % (base,))
 
179
                          'Merging from remembered submit location %s\n' % (base,))
180
180
        self.assertEndsWith(err, '+N  b\nAll changes applied successfully.\n')
181
181
        self.assertEquals(abspath(branch_b.get_submit_branch()),
182
182
                          abspath(parent))
418
418
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
419
419
        tree_c = tree_a.bzrdir.sprout('c').open_workingtree()
420
420
        out, err = self.run_bzr(['merge', '-d', 'c'])
421
 
        self.assertContainsRe(err, 'Merging from remembered location .*a\/')
 
421
        self.assertContainsRe(err, 'Merging from remembered parent location .*a\/')
422
422
        tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
423
423
        out, err = self.run_bzr(['merge', '-d', 'c'])
424
 
        self.assertContainsRe(err, 'Merging from remembered location .*b\/')
 
424
        self.assertContainsRe(err, 'Merging from remembered submit location .*b\/')
425
425
 
426
426
    def test_remember_sets_submit(self):
427
427
        tree_a = self.make_branch_and_tree('a')