/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/commands/test_push.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_push.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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 import tests
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
19
18
from bzrlib.builtins import cmd_push
20
19
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
21
20
 
28
27
        self.start_logging_connections()
29
28
 
30
29
        cmd = cmd_push()
31
 
        # We don't care about the ouput but 'outf' should be defined
32
 
        cmd.outf = tests.StringIOWrapper()
33
30
        cmd.run(self.get_url('remote'), directory='branch')
34
31
        self.assertEquals(1, len(self.connections))
35
32
 
36
 
    def test_push_onto_stacked(self):
37
 
        self.make_branch_and_tree('base', format='1.9')
38
 
        self.make_branch_and_tree('source', format='1.9')
39
 
 
40
 
        self.start_logging_connections()
41
 
 
42
 
        cmd = cmd_push()
43
 
        cmd.outf = tests.StringIOWrapper()
44
 
        cmd.run(self.get_url('remote'), directory='source',
45
 
                stacked_on=self.get_url('base'))
46
 
        self.assertEqual(1, len(self.connections))