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

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

NAME

       SVK::Command::Cmerge - Merge specific changes

SYNOPSIS

	This command is currently deprecated, pending improvements to the
	Subversion API. In the meantime, use C<svk merge -c> to obtain
	similar functionality.

	cmerge -c CHGSPEC DEPOTPATH [PATH]
	cmerge -c CHGSPEC DEPOTPATH1 DEPOTPATH2

OPTIONS

	-c [--change] REV      : act on comma-separated revisions REV
	-l [--log]	       : use logs of merged revisions as commit message
	-r [--revision] N:M    : act on revisions between N and M
	-a [--auto]	       : merge from the previous merge point
	--verbatim	       : verbatim merge log without indents and header
	--no-ticket	       : do not record this merge point
	-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::Cmerge(3)

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)