/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 breezy/tests/commands/test_merge.py

  • Committer: John Arbash Meinel
  • Date: 2006-04-25 15:05:42 UTC
  • mfrom: (1185.85.85 bzr-encoding)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060425150542-c7b518dca9928691
[merge] the old bzr-encoding changes, reparenting them on bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/commands/test_merge.py
1
 
# Copyright (C) 2007, 2009, 2010, 2016 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
 
from ...builtins import cmd_merge
18
 
from .. import (
19
 
    transport_util,
20
 
    ui_testing,
21
 
    )
22
 
 
23
 
 
24
 
class TestMerge(transport_util.TestCaseWithConnectionHookedTransport):
25
 
 
26
 
    def test_merge(self):
27
 
        wt1 = self.make_branch_and_tree('branch1')
28
 
        wt1.commit('empty commit')
29
 
        wt2 = self.make_branch_and_tree('branch2')
30
 
        wt2.pull(wt1.branch)
31
 
        wt2.commit('empty commit too')
32
 
 
33
 
        self.start_logging_connections()
34
 
 
35
 
        cmd = cmd_merge()
36
 
        cmd.outf = ui_testing.StringIOWithEncoding()
37
 
        cmd.run(self.get_url('branch1'), directory='branch2')
38
 
        self.assertEqual(1, len(self.connections))