Linux and UNIX Man Pages

Linux & Unix Commands - Search Man Pages

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

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

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)

Check Out this Related Man Page

SVK::Merge::Info(3)					User Contributed Perl Documentation				       SVK::Merge::Info(3)

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)
Man Page

12 More Discussions You Might Find Interesting

1. UNIX for Dummies Questions & Answers

WARNING: ap: no database locations

Hi everone! 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)
Discussion started by: yyt19701210
11 Replies

2. Shell Programming and Scripting

Determining directory path

Hello, I have a script where I get the full directory path of the script being executed: BASE=$0 echo "BASE:" $BASE The output looks like this: BASE: /webapps/appsdev/ACURA/rlz/ I'd like to truncate the shell name, leaving just the directory path. The directory path can be... (2 Replies)
Discussion started by: cwalsek
2 Replies

3. Post Here to Contact Site Administrators and Moderators

change log in name

I wish to change my log in name. How do I either change it or delete it and create a new name? (1 Reply)
Discussion started by: PamRainwater
1 Replies

4. AIX

Sysdump and unmirroring

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)
Discussion started by: morgan_g
2 Replies

5. AIX

Identify mirrored Pv in aix

Guys.. Any one can help me to how to identify primary mirrored disk in mirrored VG in aix 5.3.. (5 Replies)
Discussion started by: sumathi.k
5 Replies

6. UNIX for Dummies Questions & Answers

Bash encoding, how to change

Hey guys. 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)
Discussion started by: IdleProc
3 Replies

7. Programming

Parsing unix STAT structure

Hi 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)
Discussion started by: skyineyes
2 Replies

8. Solaris

WC -l does not count all the lines in a file? HELP

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)
Discussion started by: Harleyrci
6 Replies

9. Programming

Problem with Mail merge in perl

This could be a simple problem for the perl experts I am trying mail merge in perl The header file is head1 which is as under ... (6 Replies)
Discussion started by: sunnyboy
6 Replies

10. Shell Programming and Scripting

Encrypt password using "ENC"

Hi all, I saw someone using ENC to encrypt password in shell script like below, password=ENC{o6z7e9e+7zBO4EXqxRJwAYxD0Ooshr9f} Anyone knows how could I generate the code between curly brackets, from the plain text? (0 Replies)
Discussion started by: isaacniu
0 Replies

11. AIX

Need help in scripting to check if rootvg is mirrored or not

Hi 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)
Discussion started by: newtoaixos
7 Replies

12. Programming

Perl script to merge cells in column1 which has same strings, for all sheets in a excel workbook

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)
Discussion started by: Jack_Bruce
11 Replies