/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

merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
import os
19
19
import shutil
20
20
 
21
21
from bzrlib.tests import (
 
22
    SymlinkFeature,
22
23
    TestCaseWithTransport,
23
 
    TestSkipped,
24
24
    )
25
25
from bzrlib.branch import Branch
26
26
from bzrlib.errors import PointlessCommit, BzrError
42
42
        bx = wtx.branch
43
43
        wty = wtx.bzrdir.sprout('y').open_workingtree()
44
44
        by = wty.branch
45
 
        
 
45
 
46
46
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
47
47
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
48
48
 
89
89
                          wty.commit,
90
90
                          'partial commit', allow_pointless=False,
91
91
                          specific_files=['ecks'])
92
 
        
 
92
 
93
93
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
94
94
        tree = by.repository.revision_tree('y@u-0-2')
95
95
        inv = tree.inventory
102
102
        by.repository.check([by.last_revision()])
103
103
 
104
104
    def test_merge_with_symlink(self):
105
 
        if not osutils.has_symlinks():
106
 
            raise TestSkipped('Symlinks are not supported on this platform')
 
105
        self.requireFeature(SymlinkFeature)
107
106
        tree_a = self.make_branch_and_tree('tree_a')
108
107
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
109
108
        tree_a.add('link')