← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Tests of bound branches (binding, unbinding, commit, etc) command."""
33
33
 
34
34
 
35
35
class TestLegacyFormats(TestCaseWithTransport):
36
 
    
 
36
 
37
37
    def setUp(self):
38
38
        super(TestLegacyFormats, self).setUp()
39
39
        self.build_tree(['master/', 'child/'])
41
41
        self.make_branch_and_tree('child',
42
42
                        format=bzrdir.format_registry.make_bzrdir('weave'))
43
43
        os.chdir('child')
44
 
    
 
44
 
45
45
    def test_bind_format_6_bzrdir(self):
46
46
        # bind on a format 6 bzrdir should error
47
47
        out,err = self.run_bzr('bind ../master', retcode=3)
51
51
        cwd = urlutils.local_path_to_url(getcwd())
52
52
        self.assertEqual('bzr: ERROR: To use this feature you must '
53
53
                         'upgrade your branch at %s/.\n' % cwd, err)
54
 
    
 
54
 
55
55
    def test_unbind_format_6_bzrdir(self):
56
56
        # bind on a format 6 bzrdir should error
57
57
        out,err = self.run_bzr('unbind', retcode=3)
284
284
        self.check_revno(1)
285
285
 
286
286
    def test_bind_child_ahead(self):
287
 
        # test binding when the master branches history is a prefix of the 
 
287
        # test binding when the master branches history is a prefix of the
288
288
        # childs - it should bind ok but the revision histories should not
289
289
        # be altered
290
290
        child_tree = self.create_branches()[1]