~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_find_merge_base.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-02-23 17:00:36 UTC
  • mfrom: (4032.1.4 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090223170036-3q1v68ewdt8i0to5
(Marius Kruger) Remove all trailing whitespace and add tests to
        enforce this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
30
30
        b_tree.commit(message='baz', allow_pointless=True)
31
31
        r = self.run_bzr('find-merge-base b a')[0]
32
32
        self.assertEqual(q, r)
33
 
        
 
33
 
34
34
    def test_find_null_merge_base(self):
35
35
        tree = self.make_branch_and_tree('foo')
36
36
        tree.commit('message')