← 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: Martin Pool
  • Date: 2006-06-05 15:43:28 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: mbp@sourcefrog.net-20060605154328-8b1a42e5af8163ab
[broken] Fix up & refactor display of remembered urls to unescape properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
142
142
        os.chdir('branch_b')
143
143
        out = self.runbzr('merge', retcode=3)
144
144
        self.assertEquals(out,
145
 
                ('','bzr: ERROR: No merge branch known or specified.\n'))
 
145
                ('','bzr: ERROR: No location specified or remembered\n'))
146
146
        # test implicit --remember when no parent set, this merge conflicts
147
147
        self.build_tree(['d'])
148
148
        tree_b.add('d')
155
155
        out, err = self.runbzr('merge')
156
156
        
157
157
        base = urlutils.local_path_from_url(branch_a.base)
158
 
        self.assertEquals(out, 'Using saved branch: %s\n' % (base,))
 
158
        self.assertEquals(out, 'Merging from remembered location %s\n' % (base,))
159
159
        self.assertEquals(err, 'All changes applied successfully.\n')
160
160
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
161
161
        # re-open tree as external runbzr modified it