SVK::Merge - Merge context class
use SVK::Merge;
SVK::Merge->auto (repos => $repos, src => $src, dst => $dst)->run ($editor, %cb);
The "SVK::Merge" class is for representing
merge contexts, mainly including what delta is used for this merge, and what
target the delta applies to.
Given the 3 SVK::Path objects:
- src
- dst
- base
"SVK::Merge" will be applying
delta ("base",
"src") to
"dst".
Takes parameters the usual way.
Like new, but the "base" object will be found
automatically as the nearest ancestor of
"src" and
"dst".
- info
- Return a string about how the merge is done.
- run
- Given the storage editor and SVK::Editor::Merge callbacks, apply the merge
to the storage editor. Returns the number of conflicts.
Document the merge and ticket tracking mechanism.
SVK::Editor::Merge, SVK::Command::Merge, SVK::Merge::Info, Star-merge from GNU
Arch