← 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: Jelmer Vernooij
  • Date: 2008-06-11 18:58:19 UTC
  • mto: (3649.3.2 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 3658.
  • Revision ID: jelmer@samba.org-20080611185819-o4shi1ranh9zh01e
Move ftp transport into separate directory.

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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib import check, osutils
22
 
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError
24
21
from bzrlib.tests import (
25
22
    SymlinkFeature,
26
23
    TestCaseWithTransport,
27
24
    )
 
25
from bzrlib.branch import Branch
 
26
from bzrlib.errors import PointlessCommit, BzrError
28
27
from bzrlib.tests.test_revision import make_branches
 
28
from bzrlib import osutils
29
29
 
30
30
 
31
31
class TestCommitMerge(TestCaseWithTransport):
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
 
49
 
        by.fetch(bx)
 
49
        self.assertEqual((1, []), by.fetch(bx))
50
50
        # just having the history there does nothing
51
51
        self.assertRaises(PointlessCommit,
52
52
                          wty.commit,
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
96
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
97
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
98
98
 
99
 
        check.check_dwim(bx.base, False, True, True)
100
 
        check.check_dwim(by.base, False, True, True)
 
99
        bx.check()
 
100
        by.check()
 
101
        bx.repository.check([bx.last_revision()])
 
102
        by.repository.check([by.last_revision()])
101
103
 
102
104
    def test_merge_with_symlink(self):
103
105
        self.requireFeature(SymlinkFeature)