SVK::Command::Smerge(3)
NAME
SVK::Command::Smerge - Automatically merge all changes between branches
SYNOPSIS
smerge DEPOTPATH [PATH]
smerge DEPOTPATH1 DEPOTPATH2
smerge [--to|--from] [PATH]
OPTIONS
-I [--incremental] : apply each change individually
-l [--log] : use logs of merged revisions as commit message
-B [--baseless] : use the earliest revision as the merge point
-b [--base] BASE : use BASE as the merge base, which can be PATH:REV
-s [--sync] : synchronize mirrored sources before update
-t [--to] : merge to the specified path
-f [--from] : merge from the specified path
--verbatim : verbatim merge log without indents and header
--no-ticket : do not record this merge point
--track-rename : track changes made to renamed node
--host HOST : use HOST as the hostname shown in merge log
--remoterev : use remote revision numbers in merge log
-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::Smerge(3)
Mac OS X 10.6 - Generated Thu Sep 17 20:15:17 CDT 2009