← 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: 2006-04-27 20:51:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060427205154-dce92c5cf03ace34
Fix merge_remember to use a complete path.

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
 
26
from bzrlib.osutils import abspath, local_path_from_url
27
27
from bzrlib.tests.blackbox import ExternalBase
28
28
from bzrlib.workingtree import WorkingTree
29
29
 
152
152
        # test implicit --remember after resolving conflict
153
153
        tree_b.commit('commit d')
154
154
        out, err = self.runbzr('merge')
155
 
        self.assertEquals(out, 'Using saved branch: ../branch_a\n')
 
155
        
 
156
        base = local_path_from_url(branch_a.base)
 
157
        self.assertEquals(out, 'Using saved branch: %s\n' % (base,))
156
158
        self.assertEquals(err, 'All changes applied successfully.\n')
157
159
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
158
160
        # re-open tree as external runbzr modified it