This document is a Mac OS X manual page. Manual pages are a command-line technology for providing documentation. You can view these manual pages locally using the man(1) command. These manual pages come from many different sources, and thus, have a variety of writing styles.

For more information about the manual page format, see the manual page for manpages(5).

SVK::Merge(3)                        User Contributed Perl Documentation                       SVK::Merge(3)



NAME
       SVK::Merge - Merge context class

SYNOPSIS
         use SVK::Merge;

         SVK::Merge->auto (repos => $repos, src => $src, dst => $dst)->run ($editor, %cb);

DESCRIPTION
       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".

CONSTRUCTORS
       new

       Takes parameters the usual way.

       auto

       Like new, but the "base" object will be found automatically as the nearest ancestor of "src" and
       "dst".

METHODS
       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.

TODO
       Document the merge and ticket tracking mechanism.

SEE ALSO
       SVK::Editor::Merge, SVK::Command::Merge, Star-merge from GNU Arch



perl v5.8.8                                      2007-03-14                                    SVK::Merge(3)