~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

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

• reverse the comparison (5016.1.1 to 6079)
• stop comparing with revision 6079

Show diffs side-by-side

added

removed

bzrlib/tests/commands/test_merge.py

1

 

# Copyright (C) 2007, 2009, 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

34

34

        cmd = cmd_merge()

35

35

        # We don't care about the ouput but 'outf' should be defined

36

36

        cmd.outf = StringIOWrapper()

37

 

        cmd.run(self.get_url('branch1'), directory='branch2')

 

37

        cmd.run_direct(self.get_url('branch1'), directory='branch2')

38

38

        self.assertEquals(1, len(self.connections))

 

39

 

• Older »

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