~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_merger.py

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

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

Show diffs side-by-side

added

removed

bzrlib/tests/per_merger.py

1

 

# Copyright (C) 2009, 2010, 2011 Canonical Ltd

 

1

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

23

23

    errors,

24

24

    merge as _mod_merge,

25

25

    option,

 

26

    progress,

26

27

    )

27

28

from bzrlib.tests import (

28

29

    multiply_tests,

45

46

class TestMergeImplementation(TestCaseWithTransport):

46

47

 

47

48

    def do_merge(self, target_tree, source_tree, **kwargs):

48

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

49

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

49

50

            target_tree, source_tree.last_revision(),

50

51

            other_branch=source_tree.branch)

51

52

        merger.merge_type=self.merge_type

• Older »

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