← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_push.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-06-15 17:06:47 UTC
  • mfrom: (4441.1.1 bzr.ab.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090615170647-5zu6h93br8c4ue6i
(nmb) Add docs about diverged branches and refer to it when pushing
        fails

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
86
86
                           working_dir='branch_a', retcode=3)
87
87
        self.assertEquals(out,
88
88
                ('','bzr: ERROR: These branches have diverged.  '
89
 
                    'Try using "merge" and then "push".\n'))
 
89
                 'See "bzr help diverged-branches" for more information.\n'))
90
90
        self.assertEquals(osutils.abspath(branch_a.get_push_location()),
91
91
                          osutils.abspath(branch_b.bzrdir.root_transport.base))
92
92