svk::editor::merge(3) [osx man page]

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

NAME

       SVK::Editor::Merge - An editor that does merges for the storage editor

SYNOPSIS

	 $editor = SVK::Editor::Merge->new
	   ( anchor => $anchor,
	     base_anchor => $base_anchor,
	     base_root => $fs->revision_root ($arg{fromrev}),
	     target => $target,
	     storage => $storage_editor,
	     %cb,
	   );

DESCRIPTION

       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.

PARAMETERS

       options for base and target tree

       anchor
	   The anchor of the target tree.

       target
	   The target path component of the target tree.

       base_anchor
	   The anchor of the base tree.

       base_root
	   The root object of the base tree.

       storage
	   The editor that will receive the merged callbacks.

       allow_conflicts
	   Close the editor instead of abort when there are conflicts.

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

       inspector
	   The inspector reflecting the target of the merge.

       callbacks for local tree

       Since the merger needs to have information about the local tree, some callbacks must be supplied.

       cb_rev
	   Check the revision of the given path.

       cb_conflict
	   When a conflict is detected called with path and conflict type as argument. At this point type can be either 'node' or 'prop'.

       cb_prop_merged
	   Called when properties are merged without changes, that is, the "g" status.

       cb_merged
	   Called right before closing the target with changes flag, node type and ticket.

       cb_closed
	   Called after each file close call.

BUGS

       Tree merge
	   still very primitive, have to handle lots of cases

perl v5.10.0							    2008-08-04						     SVK::Editor::Merge(3)

Check Out this Related Man Page

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

NAME

       SVK::Merge::Info - Container for merge ticket information

SYNOPSIS

	 use SVK::Merge::Info;
	 my $minfo = SVK::Merge::Info->new( $svk_merge_property );

DESCRIPTION

       An "SVK::Merge::Info" object represents a collection of merge tickets, including repository UUID, path and revision.

CONSTRUCTORS

       new

       Takes a single argument with the value of an "svk:merge" property.

METHODS

       add_target
	   Add a single SVK::Target::Universal or SVK::Path to the collection of merge tickets.

       del_target
	   Remove a single SVK::Target::Universal or SVK::Path from the collection of merge tickets.

       remove_duplicated
	   Takes a single SVK::Merge::Info object as an argument.  Removes merge tickets which are present in the argument and for which the
	   argument's revision is less than or equal to our revision.

       subset_of
	   Takes a single SVK::Merge::Info object as an argument.  Returns true if our set of merge tickets is a subset of the argument's merge
	   tickets.  Otherwise, returns false.

       is_equal
	   Takes a single SVK::Merge::Info object as an argument.  Returns true if our set of merge tickets is equal to argument's. Otherwise,
	   returns false.

       union
	   Return a new SVK::Merge::Info object representing the union of ourself and the SVK::Merge::Info object given as the argument.

       resolve
       verbatim
       as_string
	   Serializes this collection of merge tickets in a form suitable for storing as an svk:merge property.

TODO

       Document the merge and ticket tracking mechanism.

SEE ALSO

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

perl v5.10.0							    2008-08-04						       SVK::Merge::Info(3)

Linux and UNIX Man Pages

svk::editor::merge(3) [osx man page]

Check Out this Related Man Page