← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_pull.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_pull.py
22
22
import sys
23
23
 
24
24
from bzrlib.branch import Branch
25
 
from bzrlib.osutils import abspath
26
25
from bzrlib.tests.blackbox import ExternalBase
27
26
from bzrlib.uncommit import uncommit
28
27
 
249
248
        out = self.runbzr('pull ../branch_a', retcode=3)
250
249
        self.assertEquals(out,
251
250
                ('','bzr: ERROR: These branches have diverged.  Try merge.\n'))
252
 
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
 
251
        self.assertEquals(branch_b.get_parent(), parent)
253
252
        # test implicit --remember after resolving previous failure
254
253
        uncommit(branch=branch_b, tree=tree_b)
255
254
        transport.delete('branch_b/d')
256
255
        self.runbzr('pull')
257
 
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
 
256
        self.assertEquals(branch_b.get_parent(), parent)
258
257
        # test explicit --remember
259
258
        self.runbzr('pull ../branch_c --remember')
260
 
        self.assertEquals(abspath(branch_b.get_parent()),
261
 
                          abspath(branch_c.bzrdir.root_transport.base))
 
259
        self.assertEquals(branch_b.get_parent(),
 
260
                          branch_c.bzrdir.root_transport.base)