← 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: Robert Collins
  • Date: 2007-04-23 02:29:35 UTC
  • mfrom: (2441 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070423022935-9hhongamvk6bfdso
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib.tests import (
 
22
    TestCaseWithTransport,
 
23
    TestSkipped,
 
24
    )
22
25
from bzrlib.branch import Branch
23
26
from bzrlib.errors import PointlessCommit, BzrError
24
27
from bzrlib.tests.test_revision import make_branches
 
28
from bzrlib import osutils
25
29
 
26
30
 
27
31
class TestCommitMerge(TestCaseWithTransport):
96
100
        by.check()
97
101
        bx.repository.check([bx.last_revision()])
98
102
        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')