/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: Martin Pool
  • Date: 2007-09-14 06:31:28 UTC
  • mfrom: (2822 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2823.
  • Revision ID: mbp@sourcefrog.net-20070914063128-0p7mh6zfb4pzdg9p
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_find_merge_base.py
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
import os
 
18
 
17
19
from bzrlib.tests.blackbox import ExternalBase
18
 
import os
19
20
 
20
21
 
21
22
class TestFindMergeBase(ExternalBase):
22
23
 
23
24
    def test_find_merge_base(self):
24
 
        os.mkdir('a')
25
 
        os.chdir('a')
26
 
        self.run_bzr('init')
27
 
        self.run_bzr('commit -m foo --unchanged')
28
 
        self.run_bzr('branch . ../b')
29
 
        q = self.run_bzr('find-merge-base . ../b')[0]
30
 
        self.run_bzr('commit -m bar --unchanged')
31
 
        os.chdir('../b')
32
 
        self.run_bzr('commit -m baz --unchanged')
33
 
        r = self.run_bzr('find-merge-base . ../a')[0]
 
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]
34
32
        self.assertEqual(q, r)
35
33
        
36
34
    def test_find_null_merge_base(self):