~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 0.16.104
• compare with another revision
• download diff
• download tarball
• view history from revision 0.16.104

• reverse the comparison (0.16.104 to 5020.1.1)
• stop comparing with revision 5020.1.1

Show diffs side-by-side

added

removed

bzrlib/tests/commands/test_merge.py

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

 

15

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

16

16

 

17

17

 

18

18

from bzrlib.builtins import cmd_merge

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_direct(self.get_url('branch1'), directory='branch2')

 

37

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

38

38

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

39

39

 

• Older »

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