/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2008-10-16 21:37:21 UTC
  • mfrom: (0.12.63 shelf-manager)
  • mto: This revision was merged to the branch mainline in revision 3823.
  • Revision ID: aaron@aaronbentley.com-20081016213721-4evccj16q9mb05uf
Merge with shelf-manager

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_find_merge_base.py
 
1
# Copyright (C) 2005 Canonical Ltd
 
2
# -*- coding: utf-8 -*-
 
3
#
 
4
# This program is free software; you can redistribute it and/or modify
 
5
# it under the terms of the GNU General Public License as published by
 
6
# the Free Software Foundation; either version 2 of the License, or
 
7
# (at your option) any later version.
 
8
#
 
9
# This program is distributed in the hope that it will be useful,
 
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
12
# GNU General Public License for more details.
 
13
#
 
14
# You should have received a copy of the GNU General Public License
 
15
# along with this program; if not, write to the Free Software
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
import os
 
18
 
 
19
from bzrlib.tests.blackbox import ExternalBase
 
20
 
 
21
 
 
22
class TestFindMergeBase(ExternalBase):
 
23
 
 
24
    def test_find_merge_base(self):
 
25
        a_tree = self.make_branch_and_tree('a')
 
26
        a_tree.commit(message='foo', allow_pointless=True)
 
27
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
28
        q = self.run_bzr('find-merge-base a b')[0]
 
29
        a_tree.commit(message='bar', allow_pointless=True)
 
30
        b_tree.commit(message='baz', allow_pointless=True)
 
31
        r = self.run_bzr('find-merge-base b a')[0]
 
32
        self.assertEqual(q, r)
 
33
        
 
34
    def test_find_null_merge_base(self):
 
35
        tree = self.make_branch_and_tree('foo')
 
36
        tree.commit('message')
 
37
        tree2 = self.make_branch_and_tree('bar')
 
38
        r = self.run_bzr('find-merge-base foo bar')[0]
 
39
        self.assertEqual('merge base is revision null:\n', r)