Rechercher une page de manuel
SVK::Command::Merge.3pm
Langue: en
Version: 2006-12-28 (mandriva - 01/05/08)
Section: 3 (Bibliothèques de fonctions)
NAME
SVK::Command::Merge - Apply differences between two sourcesSYNOPSIS
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
Contenus ©2006-2024 Benjamin Poulain
Design ©2006-2024 Maxime Vantorre