/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

First attempt to merge .dev and resolve the conflicts (but tests are 
failing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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 TestCaseWithTransport
 
21
from bzrlib.tests import (
 
22
    SymlinkFeature,
 
23
    TestCaseWithTransport,
 
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):
63
67
        wtx = self.make_branch_and_tree('x')
64
68
        base_rev = wtx.commit('common parent')
65
69
        bx = wtx.branch
 
70
        wtx.commit('establish root id')
66
71
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
72
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
67
73
        by = wty.branch
68
74
 
69
75
        self.build_tree(['x/ecks', 'y/why'])
94
100
        by.check()
95
101
        bx.repository.check([bx.last_revision()])
96
102
        by.repository.check([by.last_revision()])
 
103
 
 
104
    def test_merge_with_symlink(self):
 
105
        self.requireFeature(SymlinkFeature)
 
106
        tree_a = self.make_branch_and_tree('tree_a')
 
107
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
 
108
        tree_a.add('link')
 
109
        tree_a.commit('added link')
 
110
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
111
        self.build_tree(['tree_a/file'])
 
112
        tree_a.add('file')
 
113
        tree_a.commit('added file')
 
114
        self.build_tree(['tree_b/another_file'])
 
115
        tree_b.add('another_file')
 
116
        tree_b.commit('add another file')
 
117
        tree_b.merge_from_branch(tree_a.branch)
 
118
        tree_b.commit('merge')