SVK::Command::Smerge(3) User Contributed Perl Documentation SVK::Command::Smerge(3)NAME
SVK::Command::Smerge - Automatically merge all changes between branches
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)
Check Out this Related Man Page
SVK::Merge::Info(3) User Contributed Perl Documentation SVK::Merge::Info(3)NAME
SVK::Merge::Info - Container for merge ticket information
my $minfo = SVK::Merge::Info->new( $svk_merge_property );
An "SVK::Merge::Info" object represents a collection of merge tickets, including repository UUID, path and revision.
Takes a single argument with the value of an "svk:merge" property.
Add a single SVK::Target::Universal or SVK::Path to the collection of merge tickets.
Remove a single SVK::Target::Universal or SVK::Path from the collection of merge tickets.
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.
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.
Takes a single SVK::Merge::Info object as an argument. Returns true if our set of merge tickets is equal to argument's. Otherwise,
Return a new SVK::Merge::Info object representing the union of ourself and the SVK::Merge::Info object given as the argument.
Serializes this collection of merge tickets in a form suitable for storing as an svk:merge property.
Document the merge and ticket tracking mechanism.
SVK::Editor::Merge, SVK::Command::Merge, Star-merge from GNU Arch
perl v5.10.0 2008-08-04 SVK::Merge::Info(3)
My computer is ultra80,Operation system 2.6,when I boot get a message "WARNING: ap: no database locations "
And then I can login root , but for other user can`t login and had message "no shell". I use csh,after login root when I su -user also had... (11 Replies)
I have a script where I get the full directory path of the script being executed:
echo "BASE:" $BASE
The output looks like this:
I'd like to truncate the shell name, leaving just the directory path. The directory path can be... (2 Replies)
Discussion started by: cwalsek
3. Post Here to Contact Site Administrators and Moderators
I'm researching on how to unmirror a set of mirrored drives as this should enable me to do a failsafe patch install. My current install has 2 disk with all LVs mirrored except the sysdump LV.
This is the bit that confuses me as some seem to advise removing the sysdump from both drives (Patch... (2 Replies)
The problem is :
i need to change encoding (to be more precise UTF-8) or change the language . You see , when i log in , manuals are shown in 'Some symbols' (being written in 'Not English') and its very confusing to work. Please Help :) (3 Replies)
I am creating a utility which needs to create a log file under the path represented by an environment variable. The condition is that this path must be a valid DIRECTORY PATH. So i need to determine that the path is indeed a VALID DIRECTORY PATH.
I have written a function which will return... (2 Replies)
I have a file that I need to merge with another like file. Normally I remove the trailer reocrd and merge the file and update the trailer record of the second file. I did a WC -l on the first file before I removed the trailer record, and again afterwards. The count came back the same. I opened the... (6 Replies)
I saw someone using ENC to encrypt password in shell script like below,
Anyone knows how could I generate the code between curly brackets, from the plain text? (0 Replies)
Can some one help me with a script which when executed will check and tell if all the LV's in rootvg are mirrored or not. Say for example in the below server we could see that everything is mirrored except dumplv2. So if I execute the script it should tell that all are mirrored except... (7 Replies)
Perl script to merge cells
---------- Post updated at 12:59 AM ---------- Previous update was at 12:54 AM ----------
I am using below code to read files from a dir and print to excel.
open(my $in, '<', $file) or die "Could not open file: $!";
my $rowCount = 0;
my $colCount = 0;... (11 Replies)