Home
last modified time | relevance | path

Searched refs:Merge3Merger (Results 1 – 15 of 15) sorted by relevance

/dports/devel/brz/breezy-3.2.0/breezy/tests/
H A Dtest_merge.py337 merger.merge_type = _mod_merge.Merge3Merger
398 merger.merge_type = _mod_merge.Merge3Merger
416 merger.merge_type = _mod_merge.Merge3Merger
435 merger.merge_type = _mod_merge.Merge3Merger
454 merger.merge_type = _mod_merge.Merge3Merger
477 merger.merge_type = _mod_merge.Merge3Merger
500 merger.merge_type = _mod_merge.Merge3Merger
517 merger.merge_type = _mod_merge.Merge3Merger
1274 merger.merge_type = _mod_merge.Merge3Merger
1371 merger.merge_type = _mod_merge.Merge3Merger
[all …]
H A Dtest_merge_core.py33 Merge3Merger,
82 def merge(self, merge_type=Merge3Merger, interesting_files=None, **kwargs):
88 merger = self.make_merger(Merge3Merger, None, this_revision_tree=True)
289 self.do_contents_test(Merge3Merger)
H A Dtest_transform.py61 from ..merge import Merge3Merger, Merger
139 Merge3Merger(this.wt, this.wt, base.wt, other.wt)
208 Merge3Merger(this.wt, this.wt, base.wt, other.wt)
256 Merge3Merger(this.wt, this.wt, base.wt, other.wt)
283 Merge3Merger(this.wt, this.wt, base.wt, other.wt)
/dports/devel/brz/breezy-3.2.0/breezy/plugins/quilt/
H A Dmerge.py39 class NoUnapplyingMerger(_mod_merge.Merge3Merger):
/dports/devel/brz/breezy-3.2.0/breezy/
H A Dmerge.py693 class Merge3Merger(object): class
1155 return Merge3Merger._three_way(base_val, other, this)
1159 return Merge3Merger._three_way(unique_lca_vals.pop(), other, this)
1538 class WeaveMerger(Merge3Merger):
1607 class Diff3Merger(Merge3Merger):
1698 self.merge_type = Merge3Merger
1739 class MergeIntoMergeType(Merge3Merger):
1817 merge_type=Merge3Merger,
1857 merge_type_registry.register('merge3', Merge3Merger,
H A Dswitch.py107 merge.Merge3Merger(tree, tree, base_tree, target_tree)
H A Dworkingtree.py651 from .merge import Merger, Merge3Merger
675 merger.merge_type = Merge3Merger
H A Dshelf.py375 merger.merge_type = merge.Merge3Merger
H A Dbuiltins.py4481 merge_type = _mod_merge.Merge3Merger
4617 merger.merge_type is not _mod_merge.Merge3Merger):
4792 merge_type = _mod_merge.Merge3Merger
/dports/devel/brz/breezy-3.2.0/breezy/plugins/changelog_merge/tests/
H A Dtest_changelog_merge.py190 merger = builder.make_merger(merge.Merge3Merger, [b'clog-id'])
/dports/devel/brz/breezy-3.2.0/breezy/tests/per_tree/
H A Dtest_transform.py26 from ...merge import Merger, Merge3Merger
679 merger.merge_type = Merge3Merger
699 merger.merge_type = Merge3Merger
716 merger.merge_type = Merge3Merger
/dports/devel/brz/breezy-3.2.0/breezy/plugins/rewrite/
H A Drebase.py488 from ...merge import Merge3Merger
489 merge_type = Merge3Merger
/dports/devel/brz/breezy-3.2.0/breezy/tests/per_workingtree/
H A Dtest_merge_from_branch.py117 class QuxMerge(merge.Merge3Merger):
H A Dtest_workingtree.py1556 merger.merge_type = merge.Merge3Merger
/dports/devel/brz/breezy-3.2.0/breezy/bzr/tests/
H A Dtest_bundle.py538 merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)