← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-05 10:27:33 UTC
  • mto: (5008.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5009.
  • Revision ID: v.ladeuil+lp@free.fr-20100205102733-8wpjnqz6g4nvrbfu
All Conflict action method names start with 'action_' to avoid potential namespace collisions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_merge.py
 
1
# Copyright (C) 2007 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
from bzrlib.builtins import cmd_merge
 
19
from bzrlib.tests import StringIOWrapper
 
20
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
 
21
 
 
22
 
 
23
class TestMerge(TestCaseWithConnectionHookedTransport):
 
24
 
 
25
    def test_merge(self):
 
26
        wt1 = self.make_branch_and_tree('branch1')
 
27
        wt1.commit('empty commit')
 
28
        wt2 = self.make_branch_and_tree('branch2')
 
29
        wt2.pull(wt1.branch)
 
30
        wt2.commit('empty commit too')
 
31
 
 
32
        self.start_logging_connections()
 
33
 
 
34
        cmd = cmd_merge()
 
35
        # We don't care about the ouput but 'outf' should be defined
 
36
        cmd.outf = StringIOWrapper()
 
37
        cmd.run_direct(self.get_url('branch1'), directory='branch2')
 
38
        self.assertEquals(1, len(self.connections))
 
39