← 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: Canonical.com Patch Queue Manager
  • Date: 2006-06-08 06:38:32 UTC
  • mfrom: (1685.1.81 encoding)
  • Revision ID: pqm@pqm.ubuntu.com-20060608063832-74b46cf8fdd4567a
(jam,mbp,wvh) Lots of updates to unicode,url,and encoding support

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
27
27
from bzrlib.delta import compare_trees
28
28
from bzrlib.osutils import abspath
29
29
from bzrlib.tests.blackbox import ExternalBase
 
30
import bzrlib.urlutils as urlutils
30
31
from bzrlib.workingtree import WorkingTree
31
32
 
32
33
 
143
144
        os.chdir('branch_b')
144
145
        out = self.runbzr('merge', retcode=3)
145
146
        self.assertEquals(out,
146
 
                ('','bzr: ERROR: No merge branch known or specified.\n'))
 
147
                ('','bzr: ERROR: No location specified or remembered\n'))
147
148
        # test implicit --remember when no parent set, this merge conflicts
148
149
        self.build_tree(['d'])
149
150
        tree_b.add('d')
154
155
        # test implicit --remember after resolving conflict
155
156
        tree_b.commit('commit d')
156
157
        out, err = self.runbzr('merge')
157
 
        self.assertEquals(out, 'Using saved branch: ../branch_a\n')
 
158
        
 
159
        base = urlutils.local_path_from_url(branch_a.base)
 
160
        self.assertEquals(out, 'Merging from remembered location %s\n' % (base,))
158
161
        self.assertEquals(err, 'All changes applied successfully.\n')
159
162
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
160
163
        # re-open tree as external runbzr modified it