← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge.py

  • Committer: Aaron Bentley
  • Date: 2005-09-18 21:37:03 UTC
  • mto: (1185.1.29)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050918213703-20437815d381a735
Set a pending_merge if the merge base is forced to revno 0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge.py
24
24
    def test_unrelated(self):
25
25
        br2 = self.test_nocommits()
26
26
        commit(br2, "blah")
27
 
        merge, ['branch2', -1], [None, None]
28
27
        self.assertRaises(UnrelatedBranches, merge, ['branch2', -1], 
29
28
                          [None, None])
 
29
        return br2
30
30
 
 
31
    def test_pending_with_null(self):
 
32
        """When base is forced to revno 0, pending_merges is set"""
 
33
        br2 = self.test_unrelated()
 
34
        br1 = Branch('.')
 
35
        merge(['branch2', -1], ['branch2', 0])
 
36
        self.assertEquals(len(br1.pending_merges()), 1)
 
37
        return (br1, br2)