← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-27 19:48:46 UTC
  • mfrom: (2045.1.3 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060927194846-b26e0ca2dd3f8519
Lukáš Lalinský: TransportNotPossible has a bad docstring

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.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
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib.tests import (
22
 
    TestCaseWithTransport,
23
 
    TestSkipped,
24
 
    )
 
21
from bzrlib.tests import TestCaseWithTransport
25
22
from bzrlib.branch import Branch
26
23
from bzrlib.errors import PointlessCommit, BzrError
27
24
from bzrlib.tests.test_revision import make_branches
28
 
from bzrlib import osutils
29
25
 
30
26
 
31
27
class TestCommitMerge(TestCaseWithTransport):
67
63
        wtx = self.make_branch_and_tree('x')
68
64
        base_rev = wtx.commit('common parent')
69
65
        bx = wtx.branch
70
 
        wtx.commit('establish root id')
71
66
        wty = wtx.bzrdir.sprout('y').open_workingtree()
72
 
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
73
67
        by = wty.branch
74
68
 
75
69
        self.build_tree(['x/ecks', 'y/why'])
100
94
        by.check()
101
95
        bx.repository.check([bx.last_revision()])
102
96
        by.repository.check([by.last_revision()])
103
 
 
104
 
    def test_merge_with_symlink(self):
105
 
        if not osutils.has_symlinks():
106
 
            raise TestSkipped('Symlinks are not supported on this platform')
107
 
        tree_a = self.make_branch_and_tree('tree_a')
108
 
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
109
 
        tree_a.add('link')
110
 
        tree_a.commit('added link')
111
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
112
 
        self.build_tree(['tree_a/file'])
113
 
        tree_a.add('file')
114
 
        tree_a.commit('added file')
115
 
        self.build_tree(['tree_b/another_file'])
116
 
        tree_b.add('another_file')
117
 
        tree_b.commit('add another file')
118
 
        tree_b.merge_from_branch(tree_a.branch)
119
 
        tree_b.commit('merge')