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       Takes parameters the usual way.
29
30   auto
31       Like new, but the "base" object will be found automatically as the
32       nearest ancestor of "src" and "dst".
33

METHODS

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

TODO

42       Document the merge and ticket tracking mechanism.
43

SEE ALSO

45       SVK::Editor::Merge, SVK::Command::Merge, SVK::Merge::Info, Star-merge
46       from GNU Arch
47
48
49
50perl v5.32.1                      2021-01-27                     SVK::Merge(3)
Impressum