SVK::Editor::Merge - An editor that does merges for the storage editor $editor = SVK::Editor::Merge->new ( anchor => $anchor, base_anchor => $base_anchor, base_root => $fs->revision_root ($arg{fromrev}), target => $target, storage => $storage_editor, %cb, ); Given the base root and callbacks for local tree, SVK::Editor::Merge forwards the incoming editor calls to the storage editor for modifying the local tree, and merges the tree delta and text delta transparently.

options for base and target tree
The anchor of the target tree. The target path component of the target tree. The anchor of the base tree. The root object of the base tree. The editor that will receive the merged callbacks. Close the edito instead of abort when there are conflicts. open the directory even if cb_exist failed. This is for use in conjunction with SVK::Editor::Rename for the case that a descendent exists but its parent does not.

callbacks for local tree
Since the merger needs to have information about the local tree, some callbacks must be supplied. Check if the given path exists. Check the revision of the given path. Called when a conflict is detected. Called when the merger needs to retrieve the local modification of a file. Return an arrayref of filename, filehandle, and md5. Return undef if there is no local modification. Called when the merger needs to retrieve the local modification of a property. Return the property value. Called when properties are merged without changes, that is, the "g" status. When "delete_entry" needs to check if everything to be deleted does not cause conflict on the directory, it calls the callback with path, base_root, and base_path. The returned value should be a hash with changed paths being the keys and change types being the values. Called right before closing the top directory with storage editor, root baton, and pool. Called after each file close call. still very primitive, have to handle lots of cases Chia-liang Kao <clkao@clkao.org> Copyright 2003-2005 by Chia-liang Kao <clkao@clkao.org>. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. See <http://www.perl.com/perl/misc/Artistic.html>