1SVK::Editor::Merge(3) User Contributed Perl DocumentationSVK::Editor::Merge(3)
2
3
4
6 SVK::Editor::Merge - An editor that does merges for the storage editor
7
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
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
24 options for base and target tree
25
26 anchor
27 The anchor of the target tree.
28
29 target
30 The target path component of the target tree.
31
32 base_anchor
33 The anchor of the base tree.
34
35 base_root
36 The root object of the base tree.
37
38 storage
39 The editor that will receive the merged callbacks.
40
41 allow_conflicts
42 Close the edito instead of abort when there are conflicts.
43
44 open_nonexist
45 open the directory even if cb_exist failed. This is for use in con‐
46 junction with SVK::Editor::Rename for the case that a descendent
47 exists but its parent does not.
48
49 inspector
50 The inspector reflecting the target of the merge.
51
52 callbacks for local tree
53
54 Since the merger needs to have information about the local tree, some
55 callbacks must be supplied.
56
57 cb_rev
58 Check the revision of the given path.
59
60 cb_conflict
61 Called when a conflict is detected.
62
63 cb_prop_merged
64 Called when properties are merged without changes, that is, the "g"
65 status.
66
67 cb_merged
68 Called right before closing the top directory with storage editor,
69 root baton, and pool.
70
71 cb_closed
72 Called after each file close call.
73
75 Tree merge
76 still very primitive, have to handle lots of cases
77
78
79
80perl v5.8.8 2006-12-28 SVK::Editor::Merge(3)