/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_join.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import (
 
20
from breezy import (
21
21
    osutils,
22
22
    tests,
23
23
    workingtree,
92
92
        out, err = self.run_bzr('join --reference tree/subtree',
93
93
                                retcode=3)
94
94
        self.assertContainsRe(err, r"Can't join trees")
95
 
        self.assertContainsRe(err, r"use bzr upgrade")
 
95
        self.assertContainsRe(err, r"use brz upgrade")