/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: John Arbash Meinel
  • Date: 2006-05-02 20:46:11 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060502204611-02caa5c20fb84ef8
Moved url functions into bzrlib.urlutils

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
23
23
 
24
24
from bzrlib.branch import Branch
25
25
from bzrlib.bzrdir import BzrDir
26
 
from bzrlib.osutils import abspath, local_path_from_url
 
26
from bzrlib.osutils import abspath
27
27
from bzrlib.tests.blackbox import ExternalBase
 
28
import bzrlib.urlutils as urlutils
28
29
from bzrlib.workingtree import WorkingTree
29
30
 
30
31
 
153
154
        tree_b.commit('commit d')
154
155
        out, err = self.runbzr('merge')
155
156
        
156
 
        base = local_path_from_url(branch_a.base)
 
157
        base = urlutils.local_path_from_url(branch_a.base)
157
158
        self.assertEquals(out, 'Using saved branch: %s\n' % (base,))
158
159
        self.assertEquals(err, 'All changes applied successfully.\n')
159
160
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))