/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

  • Committer: John Arbash Meinel
  • Date: 2009-06-12 18:05:15 UTC
  • mto: (4371.4.5 vila-better-heads)
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090612180515-t0cwbjsnve094oik
Add a failing test for handling nodes that are in the same linear chain.

It fails because the ancestry skipping causes us to miss the fact that the two nodes
are actually directly related. We could check at the beginning, as the 
code used to do, but I think that will be incomplete for the more-than-two
heads cases.

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
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):
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,
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)