← 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: Gordon Tyler
  • Date: 2010-02-02 06:30:43 UTC
  • mto: (5037.3.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5046.
  • Revision ID: gordon@doxxx.net-20100202063043-3ygr1114d25m3f7m
Added cmdline.split function, which replaces commands.shlex_split_unicode.

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 import check, osutils
 
22
from bzrlib.branch import Branch
 
23
from bzrlib.errors import PointlessCommit, BzrError
21
24
from bzrlib.tests import (
22
25
    SymlinkFeature,
23
26
    TestCaseWithTransport,
24
27
    )
25
 
from bzrlib.branch import Branch
26
 
from bzrlib.errors import PointlessCommit, BzrError
27
28
from bzrlib.tests.test_revision import make_branches
28
 
from bzrlib import osutils
29
29
 
30
30
 
31
31
class TestCommitMerge(TestCaseWithTransport):
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
 
        self.assertEqual((1, []), by.fetch(bx))
 
49
        by.fetch(bx)
50
50
        # just having the history there does nothing
51
51
        self.assertRaises(PointlessCommit,
52
52
                          wty.commit,
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
 
        bx.check()
100
 
        by.check()
101
 
        bx.repository.check([bx.last_revision()])
102
 
        by.repository.check([by.last_revision()])
 
99
        check.check_dwim(bx.base, False, True, True)
 
100
        check.check_dwim(by.base, False, True, True)
103
101
 
104
102
    def test_merge_with_symlink(self):
105
103
        self.requireFeature(SymlinkFeature)