← 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: Vincent Ladeuil
  • Date: 2011-09-09 13:30:12 UTC
  • mfrom: (5609.48.11 2.3)
  • mto: (6015.33.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6134.
  • Revision ID: v.ladeuil+lp@free.fr-20110909133012-jc1d1zyqgak57123
Merge 2.3 into 2.4

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, 2007, 2009, 2011 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
16
16
 
17
17
 
18
18
import os
19
 
import shutil
20
19
 
 
20
from bzrlib import check, osutils
 
21
from bzrlib.errors import PointlessCommit
21
22
from bzrlib.tests import (
22
23
    SymlinkFeature,
23
24
    TestCaseWithTransport,
24
25
    )
25
 
from bzrlib.branch import Branch
26
 
from bzrlib.errors import PointlessCommit, BzrError
27
 
from bzrlib.tests.test_revision import make_branches
28
 
from bzrlib import osutils
29
26
 
30
27
 
31
28
class TestCommitMerge(TestCaseWithTransport):
92
89
 
93
90
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
94
91
        tree = by.repository.revision_tree('y@u-0-2')
95
 
        inv = tree.inventory
96
 
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
97
 
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
 
92
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
 
93
        self.assertEquals(tree.get_file_revision('why-id'), 'y@u-0-1')
98
94
 
99
 
        bx.check()
100
 
        by.check()
101
 
        bx.repository.check([bx.last_revision()])
102
 
        by.repository.check([by.last_revision()])
 
95
        check.check_dwim(bx.base, False, True, True)
 
96
        check.check_dwim(by.base, False, True, True)
103
97
 
104
98
    def test_merge_with_symlink(self):
105
99
        self.requireFeature(SymlinkFeature)