/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/merge.py

Improve the API for Transform.

Merged from https://code.launchpad.net/~jelmer/brz/transform/+merge/386855

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
1288
1288
                    keep_this = True
1289
1289
                    # versioning the merged file will trigger a duplicate
1290
1290
                    # conflict
1291
 
                    self.tt.version_file(file_id, trans_id)
 
1291
                    self.tt.version_file(trans_id, file_id=file_id)
1292
1292
                    transform.create_from_tree(
1293
1293
                        self.tt, trans_id, self.other_tree,
1294
1294
                        other_path,
1335
1335
        else:
1336
1336
            raise AssertionError('unknown hook_status: %r' % (hook_status,))
1337
1337
        if not this_path and result == "modified":
1338
 
            self.tt.version_file(file_id, trans_id)
 
1338
            self.tt.version_file(trans_id, file_id=file_id)
1339
1339
        if not keep_this:
1340
1340
            # The merge has been performed and produced a new content, so the
1341
1341
            # old contents should not be retained.
1486
1486
                    filter_tree_path)
1487
1487
                file_group.append(trans_id)
1488
1488
                if set_version and not versioned:
1489
 
                    self.tt.version_file(file_id, trans_id)
 
1489
                    self.tt.version_file(trans_id, file_id=file_id)
1490
1490
                    versioned = True
1491
1491
        return file_group
1492
1492