← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-06 12:20:16 UTC
  • mfrom: (1551.8.23 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20060906122016-54ab3159023ef544
Improve conflict message for deleting directories with contents

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 by Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
67
67
        self.runbzr('branch source target --basis commit_tree')
68
68
        target = bzrdir.BzrDir.open('target')
69
69
        self.assertEqual('2', target.open_branch().last_revision())
70
 
        self.assertEqual(['2'], target.open_workingtree().get_parent_ids())
 
70
        self.assertEqual('2', target.open_workingtree().last_revision())
71
71
        self.assertTrue(target.open_branch().repository.has_revision('2'))
72
72
 
73
73
    def test_branch_only_copies_history(self):