← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge.py

  • Committer: Lalo Martins
  • Date: 2005-09-14 05:22:13 UTC
  • mfrom: (1185.1.10)
  • mto: (1185.1.22)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050914052213-2aa5c1005959abdf
merging from Robert's integration branch

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)