~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Committer: Aaron Bentley
Date: 2006-02-08 17:16:12 UTC
mto: (1558.1.4 Aaron's integration) (1534.9.2 Transactional Tree Transforms) (1185.50.82 bzr-jam-integration) (2027.1.2 revert-subpath-56549)
mto: This revision was merged to the branch mainline in revision 1558.
Revision ID: aaron.bentley@utoronto.ca-20060208171612-728e6d1b9438df4b

Converted test cases to Tree Transform

files added:
trash

files renamed:
bzrlib/_changeset.py => trash/_changeset.py

bzrlib/_merge_core.py => trash/_merge_core.py

files modified:
bzrlib/builtins.py

bzrlib/merge.py

bzrlib/tests/test_merge_core.py

bzrlib/transform.py

Show diffs side-by-side

added added

removed removed

bzrlib/builtins.py

2076

clients might prefer to call merge.merge_inner(), which has less magic

2077

behavior.

2078

"""

2079

from bzrlib.merge import Merger, _MergeConflictHandler

2079

from bzrlib.merge import Merger

2080

if this_dir is None:

2081

this_dir = u'.'

2082

this_tree = WorkingTree.open_containing(this_dir)[0]

2100

merger.set_interesting_files(file_list)

2101

merger.show_base = show_base

2102

merger.reprocess = reprocess

2103

merger.conflict_handler = _MergeConflictHandler(merger.this_tree,

2104

merger.base_tree,

2105

merger.other_tree,

2106

ignore_zero=ignore_zero)

2107

2103

conflicts = merger.do_merge()

2108

2104

merger.set_pending()

2109

2105

return conflicts

Older »