← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Aaron Bentley
  • Date: 2007-07-11 22:16:29 UTC
  • mto: This revision was merged to the branch mainline in revision 2606.
  • Revision ID: aaron.bentley@utoronto.ca-20070711221629-tbqh4m4mps264lxe
Fix trailing whitespace

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
54
54
    def test_nocommits(self):
55
55
        self.test_pending()
56
56
        wt2 = self.make_branch_and_tree('branch2')
57
 
        self.assertRaises(NoCommits, _merge_helper, ['branch2', -1], 
 
57
        self.assertRaises(NoCommits, _merge_helper, ['branch2', -1],
58
58
                          [None, None])
59
59
        return wt2
60
60
 
61
61
    def test_unrelated(self):
62
62
        wt2 = self.test_nocommits()
63
63
        wt2.commit("blah")
64
 
        self.assertRaises(UnrelatedBranches, _merge_helper, ['branch2', -1], 
 
64
        self.assertRaises(UnrelatedBranches, _merge_helper, ['branch2', -1],
65
65
                          [None, None])
66
66
        return wt2
67
67