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

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

NAME

       SVK::Command::Merge - Apply differences between two sources

SYNOPSIS

	merge -r N:M DEPOTPATH [PATH]
	merge -r N:M DEPOTPATH1 DEPOTPATH2
	merge -r N:M [--to|--from] [PATH]

OPTIONS

	-r [--revision] N:M    : act on revisions between N and M
	-c [--change] N        : act on change N (between revisions N-1 and N)
				 using -N reverses the changes made in revision N
	-I [--incremental]     : apply each change individually
	-a [--auto]	       : merge from the previous merge point
	-l [--log]	       : use logs of merged revisions as commit message
	-s [--sync]	       : synchronize mirrored sources before operation
	-t [--to]	       : merge to the specified path
	-f [--from]	       : merge from the specified path
	--summary	       : display related logs in this merge
	--verbatim	       : verbatim merge log without indents and header
	--no-ticket	       : do not record this merge point
	--track-rename	       : track changes made to renamed node
	-m [--message] MESSAGE : specify commit message MESSAGE
	-F [--file] FILENAME   : read commit message from FILENAME
	--template	       : use the specified message as the template to edit
	--encoding ENC	       : treat -m/-F value as being in charset encoding ENC
	-P [--patch] NAME      : instead of commit, save this change as a patch
	-S [--sign]	       : sign this change
	-C [--check-only]      : try operation but make no changes
	--direct	       : commit directly even if the path is mirrored

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

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)