1SVK::Command::Smerge(3)User Contributed Perl DocumentatioSnVK::Command::Smerge(3)
2
6 SVK::Command::Smerge - Automatically merge all changes between branches
7
9 smerge DEPOTPATH [PATH]
10 smerge DEPOTPATH1 DEPOTPATH2
11 smerge [--to|--from] [PATH]
12
14 -I [--incremental] : apply each change individually
15 -l [--log] : use logs of merged revisions as commit message
16 -B [--baseless] : use the earliest revision as the merge point
17 -b [--base] BASE : use BASE as the merge base, which can be PATH:REV
18 -s [--sync] : synchronize mirrored sources before update
19 -t [--to] : merge to the specified path
20 -f [--from] : merge from the specified path
21 --verbatim : verbatim merge log without indents and header
22 --no-ticket : do not record this merge point
23 --track-rename : track changes made to renamed node
24 --host HOST : use HOST as the hostname shown in merge log
25 --remoterev : use remote revision numbers in merge log
26 -m [--message] MESSAGE : specify commit message MESSAGE
27 -F [--file] FILENAME : read commit message from FILENAME
28 --template : use the specified message as the template to edit
29 --encoding ENC : treat -m/-F value as being in charset encoding ENC
30 -P [--patch] NAME : instead of commit, save this change as a patch
31 -S [--sign] : sign this change
32 -C [--check-only] : try operation but make no changes
33 --direct : commit directly even if the path is mirrored
34perl v5.12.4 2008-08-05 SVK::Command::Smerge(3)