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

NAME

6       SVK::Merge - Merge context class
7

SYNOPSIS

9         use SVK::Merge;
10
11         SVK::Merge->auto (repos => $repos, src => $src, dst => $dst)->run ($editor, %cb);
12

DESCRIPTION

14       The "SVK::Merge" class is for representing merge contexts, mainly
15       including what delta is used for this merge, and what target the delta
16       applies to.
17
18       Given the 3 SVK::Path objects:
19
20       src
21       dst
22       base
23
24       "SVK::Merge" will be applying delta ("base", "src") to "dst".
25

CONSTRUCTORS

27       new
28
29       Takes parameters the usual way.
30
31       auto
32
33       Like new, but the "base" object will be found automatically as the
34       nearest ancestor of "src" and "dst".
35

METHODS

37       info
38           Return a string about how the merge is done.
39
40       run Given the storage editor and SVK::Editor::Merge callbacks, apply
41           the merge to the storage editor. Returns the number of conflicts.
42

TODO

44       Document the merge and ticket tracking mechanism.
45

SEE ALSO

47       SVK::Editor::Merge, SVK::Command::Merge, Star-merge from GNU Arch
48
49
50
51perl v5.8.8                       2006-12-28                     SVK::Merge(3)
Impressum