|
1551.3.11
by Aaron Bentley
Merge from Robert |
1 |
# Copyright (C) 2005 by 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 |
from bzrlib.tests.blackbox import ExternalBase |
|
18 |
import os |
|
19 |
||
20 |
||
21 |
class TestFindMergeBase(ExternalBase): |
|
22 |
def test_find_merge_base(self): |
|
23 |
os.mkdir('a') |
|
24 |
os.chdir('a') |
|
25 |
self.runbzr('init') |
|
26 |
self.runbzr('commit -m foo --unchanged') |
|
27 |
self.runbzr('branch . ../b') |
|
28 |
q = self.run_bzr('find-merge-base', '.', '../b', backtick=True) |
|
29 |
self.runbzr('commit -m bar --unchanged') |
|
30 |
os.chdir('../b') |
|
31 |
self.runbzr('commit -m baz --unchanged') |
|
32 |
r = self.run_bzr('find-merge-base', '.', '../a', backtick=True) |
|
33 |
self.assertEqual(q, r) |
|
34 |