SVK::Merge(3)

πŸ“¦
version 2.2.3 Β· 2 versions
, in fedora 43

πŸ’– SVK::Merge β€” the merge context class, bestie πŸ’–

okay so this is SVK::Merge(3), straight out of the User Contributed Perl Documentation ✨ it's a Perl module and it's literally the class that holds your merge context, and we're gonna get you fluent in it, no cap 🫢


✨ SYNOPSIS ✨

use SVK::Merge;

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

that's the whole vibe right there πŸ’… auto builds it, run does it. slay.


🌸 DESCRIPTION 🌸

so the SVK::Merge class is for representing merge contexts β€” and by that we mainly mean: what delta is being used for this merge, and what target that delta applies to. that's the entire job. it holds the tea πŸ“

give it the 3 SVK::Path objects:

  • src
  • dst
  • base

and then SVK::Merge will be applying the delta (base, src) to dst. yep, that's the direction. base β†’ src is the delta, and it lands on dst. iconic. πŸ¦‹


πŸŽ€ CONSTRUCTORS πŸŽ€

new

takes parameters the usual way. no surprises, no drama, just vibes πŸ’œ

auto

like new, but the base object gets found automatically as the nearest ancestor of src and dst. it just knows. main character energy fr fr πŸ‘‘


πŸ’… METHODS πŸ’…

  • info β€” returns a string about how the merge is done. like, a lil status report on the merge situation πŸ“
  • run β€” given the storage editor and SVK::Editor::Merge callbacks, apply the merge to the storage editor. and it returns the number of conflicts β€” so yeah, if that number isn't zero, that's your sign 😭 keep an eye on it bestie.

🌈 TODO 🌈

document the merge and ticket tracking mechanism. it's on the list, it's giving "we'll get to it" πŸ™ˆ (not me calling out the docs, but also... yeah.)


⭐ SEE ALSO ⭐

  • SVK::Editor::Merge
  • SVK::Command::Merge
  • SVK::Merge::Info
  • Star-merge from GNU Arch

go read those if you wanna go deeper, iykyk πŸ’–


okay that's the whole page! this one's from perl v5.42.0, dated 2025-07-25, and it's SVK::Merge(3) β€” go merge something, bestie, you got this πŸ’…βœ¨πŸŽ€

πŸ“¦ where this page comes from