~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

• browse files at revision 4031.3.2
• compare with another revision
• compare with revision 4031.3.2
• download diff
• download tarball
• view history from revision 4031.3.2

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_find_merge_base.py

13

13

#

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

 

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 

16

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

17

17

import os

18

18

 

19

19

from bzrlib.tests.blackbox import ExternalBase

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')

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1