← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge.py

  • Committer: Martin Pool
  • Date: 2005-07-07 10:22:02 UTC
  • Revision ID: mbp@sourcefrog.net-20050707102201-2d2a13a25098b101
- rearrange and clear up merged weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge.py
1
 
from bzrlib.branch import Branch
2
 
from bzrlib.commit import commit
3
 
from bzrlib.selftest import TestCaseInTempDir
4
 
from bzrlib.merge import merge
5
 
class TestMerge(TestCaseInTempDir):
6
 
    """Test appending more than one revision"""
7
 
    def test_pending(self):
8
 
        br = Branch(".", init=True)
9
 
        commit(br, "lala!")
10
 
        self.assertEquals(len(br.pending_merges()), 0)
11
 
        merge(['.', -1], [None, None])
12
 
        self.assertEquals(len(br.pending_merges()), 0)