~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

[merge] bzr.dev 2255, resolve conflicts, update copyrights

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
197
197
 
198
198
        # The pending merges should still be there
199
199
        self.assertEqual(['o2'], checkout1.get_parent_ids()[1:])
 
200
 
 
201
    def test_readonly_lightweight_update(self):
 
202
        """Update a light checkout of a readonly branch"""
 
203
        tree = self.make_branch_and_tree('branch')
 
204
        readonly_branch = branch.Branch.open(self.get_readonly_url('branch'))
 
205
        checkout = readonly_branch.create_checkout('checkout', 
 
206
                                                   lightweight=True)
 
207
        tree.commit('empty commit')
 
208
        self.runbzr(['update', 'checkout'])