← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-08-12 09:49:24 UTC
  • mfrom: (6015.9.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: v.ladeuil+lp@free.fr-20110812094924-knc5s0g7vs31a2f1
Merge 2.4 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_split.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
 
18
 
import os
19
 
 
20
 
from bzrlib import bzrdir, tests, workingtree
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
from bzrlib import tests, workingtree
21
19
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit4
22
 
from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack4
 
20
from bzrlib.repofmt.knitpack_repo import RepositoryFormatKnitPack4
23
21
 
24
22
 
25
23
 
31
29
        wt.add(['b', 'b/c'])
32
30
        wt.commit('rev1')
33
31
        self.run_bzr('split a/b')
34
 
        self.run_bzr_error(('.* is not versioned',), 'split q')
 
32
        self.run_bzr_error(('.* is not versioned',), 'split q', working_dir='a')
35
33
 
36
34
    def test_split_repo_failure(self):
37
35
        repo = self.make_repository('branch', shared=True, format='knit')
47
45
        self.build_tree(['tree/subtree/'])
48
46
        tree.add('subtree')
49
47
        tree.commit('added subtree')
50
 
        self.run_bzr_error(('must upgrade your branch at .*tree',),
 
48
        self.run_bzr_error(('must upgrade your branch at .*tree','rich roots'),
51
49
                           'split tree/subtree')
52
50
 
53
51
    def split_formats(self, format, repo_format):