← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_pull.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_pull.py
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
 
from cStringIO import StringIO
19
18
 
20
19
from bzrlib import tests
21
20
from bzrlib.tests import per_workingtree
85
84
        return builder.get_branch()
86
85
 
87
86
    def test_pull_orphans(self):
88
 
        from bzrlib import workingtree
89
 
        if isinstance(self.workingtree_format, workingtree.WorkingTreeFormat2):
 
87
        if not self.workingtree_format.missing_parent_conflicts:
90
88
            raise tests.TestSkipped(
91
 
                'WorkingTreeFormat2 does not support missing parent conflicts')
 
89
                '%r does not support missing parent conflicts' %
 
90
                    self.workingtree_format)
92
91
        trunk = self.make_branch_deleting_dir('trunk')
93
92
        work = trunk.bzrdir.sprout('work', revision_id='2').open_workingtree()
94
93
        work.branch.get_config().set_user_option(