Login or Register to Ask a Question and Join Our Community

Linux and UNIX Man Pages

Linux & Unix Commands - Search Man Pages

svk::merge::info(3) [osx man page]

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

NAME

       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)

Check Out this Related Man Page

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

NAME

       SVK::Command::Merge - Apply differences between two sources

SYNOPSIS

	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

perl v5.10.0							    2008-08-04						    SVK::Command::Merge(3)
Man Page

14 More Discussions You Might Find Interesting

1. Shell Programming and Scripting

Merge lines into one

Source data file from oracle, terminated by ",". 'Cause some of fields have \r\n, then those lines were splitted into multiple lines in the expoted data file. Just vi this file, and found ^M. How to concatenate these line into one if it has a ^M at then end. thanks, (7 Replies)
Discussion started by: anypager
7 Replies

2. Shell Programming and Scripting

Merge all commands into one

how can i merge follwoing process to one... tail +5 rawdata_AAA_1.txt_$$ | grep -v "^$" >> rawdata_AAA_2.txt_$$ For discarding first 5 rows and deleting null rows awk '!/^ /{if(a) print a; a=$0}/^ /{print a}' rawdata_AAA_2.txt >> rawdata_AAA_3.txt For merging record if it split into 2 rows... (8 Replies)
Discussion started by: Amit.Sagpariya
8 Replies

3. UNIX for Dummies Questions & Answers

Merge lines together in unix

I have a file like this. Pls help me to solve this in ksh (I should look for only Message : 111 and need to print the start time to end time Need to ignore other type of messages. Ex: if first message is 111 and second message is 000 or anything else then ignore the 2nd one and print start time... (7 Replies)
Discussion started by: mnjx
7 Replies

4. Shell Programming and Scripting

Merge two files based on a 3rd key file

Hi, I want to merge the two files based on the key file's columns. The key file: DATE~DATE HOUSE~IN_HOUSE CUST~IN_CUST PRODUCT~PRODUCT ADDRESS~CUST_ADDR BASIS_POINTS~BASIS_POINTS ... The other 2 files are From_file & To_file - The From_file: DATE|date/time|29|9 ... (9 Replies)
Discussion started by: dips_ag
9 Replies

5. Shell Programming and Scripting

Merge two non-consecutive lines based on line number or string

This is a variation of an earlier post found here: unixcom/shell-programming-scripting/159821-merge-two-non-consecutive-lines.html User Bartus11 was kind enough to solve that example. Previously, I needed help combining two lines that are non-consecutive in a file. Now I need to do the... (7 Replies)
Discussion started by: munkee
7 Replies

6. Windows & DOS: Issues & Discussions

gawk: Merge N files into one

hi all! i'm an awk newbie and have been trying in vain to merge N files together. ie. file1.txt: a b c 1 1 1 2 2 2 3 3 3 4 4 4 file2.txt: a b c 5 5 5 6 6 6 7 7 7 8 8 8 (13 Replies)
Discussion started by: sameeribraimo
13 Replies

7. Shell Programming and Scripting

Merge two files with different lengths

Hi there, I have two very long files like: file1: two fields 1 123 1 125 1 234 2 123 2 234 2 300 2 312 3 10 3 215 4 56 ... (11 Replies)
Discussion started by: ClaraW
11 Replies

8. Programming

Merge two strings by overlapped region

Hello, I am trying to concatenate two strings by merging the overlapped region. E.g. Seq1=ACGTGCCC Seq2=CCCCCGTGTGTGT Seq_merged=ACGTGCCCCCGTGTGTGTFunction strcat(char *dest, char *src) appends the src string to the dest string, ignoring the overlapped parts (prefix of src and suffix of dest).... (30 Replies)
Discussion started by: yifangt
30 Replies

9. Shell Programming and Scripting

Merge columns from multiple files

Hello and Good day I have a lot of files with same number of rows and columns.$2 and $3 are the same in all files . I need to merge $2,$3,$6 from first file and $6 from another files. File1: $1 $2 $3 $4 $5 $6... (8 Replies)
Discussion started by: ali.seifaddini
8 Replies

10. Shell Programming and Scripting

Merge column file

Hi All, I have on file1 and file2 some, $cat file1 aaa bbb ccc ddd eee fff ggg hhh iii jjj with line blank, and (12 Replies)
Discussion started by: aav1307
12 Replies

11. UNIX for Advanced & Expert Users

Merge files with multi-line stanzas

Hello. I try to merge few /etc/qconfig files in AIX (from few servers into one file on new server). Could you please help me what would be the best way to merge files that contain multi-line stanzas, like this: stanza1: attr1 = value1 attr2 = value2 attr3 = value3 stanza2: attr1 =... (7 Replies)
Discussion started by: kareem33
7 Replies

12. Shell Programming and Scripting

Merge files in a directory

Hey Guys, I want to merge all files (Apache Tomcat Access Logs) for a particular date say "Aug 24" to be merged into a single file. Is there any quick hack for that ? $ ls -alrth access_log2016-08-*|grep "Aug 24" -rw-rw-r--. 1 tomcat tomcat 16M Aug 24 00:00... (8 Replies)
Discussion started by: bluemind2005
8 Replies

13. UNIX for Beginners Questions & Answers

Match and Merge two file

Hi All, I have two file . I need to merge both file based on a match. File 1: Column1 column2 column3 column4 File 2: column3 column5 I need to combine the two file based on match , Which in my case is column3 and combine the file as below Combined file Column1 (10 Replies)
Discussion started by: arunkumar_mca
10 Replies

14. UNIX for Beginners Questions & Answers

Merge multiple columns into one using cat

I will like to merge several files using 'cat', but I observe the output is not consistent. the merge begins at the last line of the first file. file1.txt: 1234 1234 1234 file2.txt: aaaa bbbb cccc dddd cat file1.txt file2.txt > file3.txt file3.txt: 1234 1234 1234aaaa bbbb cccc... (13 Replies)
Discussion started by: geomarine
13 Replies