1SVK::Editor::Merge(3) User Contributed Perl DocumentationSVK::Editor::Merge(3)
2
3
4

NAME

6       SVK::Editor::Merge - An editor that does merges for the storage editor
7

SYNOPSIS

9         $editor = SVK::Editor::Merge->new
10           ( anchor => $anchor,
11             base_anchor => $base_anchor,
12             base_root => $fs->revision_root ($arg{fromrev}),
13             target => $target,
14             storage => $storage_editor,
15             %cb,
16           );
17

DESCRIPTION

19       Given the base root and callbacks for local tree, SVK::Editor::Merge
20       forwards the incoming editor calls to the storage editor for modifying
21       the local tree, and merges the tree delta and text delta transparently.
22

PARAMETERS

24   options for base and target tree
25       anchor
26           The anchor of the target tree.
27
28       target
29           The target path component of the target tree.
30
31       base_anchor
32           The anchor of the base tree.
33
34       base_root
35           The root object of the base tree.
36
37       storage
38           The editor that will receive the merged callbacks.
39
40       allow_conflicts
41           Close the editor instead of abort when there are conflicts.
42
43       open_nonexist
44           open the directory even if cb_exist failed. This is for use in
45           conjunction with SVK::Editor::Rename for the case that a descendent
46           exists but its parent does not.
47
48       inspector
49           The inspector reflecting the target of the merge.
50
51   callbacks for local tree
52       Since the merger needs to have information about the local tree, some
53       callbacks must be supplied.
54
55       cb_rev
56           Check the revision of the given path.
57
58       cb_conflict
59           When a conflict is detected called with path and conflict type as
60           argument. At this point type can be either 'node' or 'prop'.
61
62       cb_prop_merged
63           Called when properties are merged without changes, that is, the "g"
64           status.
65
66       cb_merged
67           Called right before closing the target with changes flag, node type
68           and ticket.
69
70       cb_closed
71           Called after each file close call.
72

BUGS

74       Tree merge
75           still very primitive, have to handle lots of cases
76
77
78
79perl v5.28.0                      2008-08-05             SVK::Editor::Merge(3)
Impressum