GSP
Quick Navigator

Search Site

Unix VPS
A - Starter
B - Basic
C - Preferred
D - Commercial
MPS - Dedicated
Previous VPSs
* Sign Up! *

Support
Contact Us
Online Help
Handbooks
Domain Status
Man Pages

FAQ
Virtual Servers
Pricing
Billing
Technical

Network
Facilities
Connectivity
Topology Map

Miscellaneous
Server Agreement
Year 2038
Credits
 

USA Flag

 

 

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

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
2008-08-05 perl v5.32.1

Search for    or go to Top of page |  Section 3 |  Main Index

Powered by GSP Visit the GSP FreeBSD Man Page Interface.
Output converted with ManDoc.