Linux and UNIX Man Pages

Linux & Unix Commands - Search Man Pages

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

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

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)

Check Out this Related Man Page

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

SVK::Editor::Merge - An editor that does merges for the storage editor SYNOPSIS
$editor = SVK::Editor::Merge->new ( anchor => $anchor, base_anchor => $base_anchor, base_root => $fs->revision_root ($arg{fromrev}), target => $target, storage => $storage_editor, %cb, ); DESCRIPTION
Given the base root and callbacks for local tree, SVK::Editor::Merge forwards the incoming editor calls to the storage editor for modifying the local tree, and merges the tree delta and text delta transparently. PARAMETERS
options for base and target tree anchor The anchor of the target tree. target The target path component of the target tree. base_anchor The anchor of the base tree. base_root The root object of the base tree. storage The editor that will receive the merged callbacks. allow_conflicts Close the editor instead of abort when there are conflicts. open_nonexist open the directory even if cb_exist failed. This is for use in conjunction with SVK::Editor::Rename for the case that a descendent exists but its parent does not. inspector The inspector reflecting the target of the merge. callbacks for local tree Since the merger needs to have information about the local tree, some callbacks must be supplied. cb_rev Check the revision of the given path. cb_conflict When a conflict is detected called with path and conflict type as argument. At this point type can be either 'node' or 'prop'. cb_prop_merged Called when properties are merged without changes, that is, the "g" status. cb_merged Called right before closing the target with changes flag, node type and ticket. cb_closed Called after each file close call. BUGS
Tree merge still very primitive, have to handle lots of cases perl v5.10.0 2008-08-04 SVK::Editor::Merge(3)
Man Page

15 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. 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

3. 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

4. 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

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. 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

7. Shell Programming and Scripting

Merge of two input file by search

Hi i am running a issue with the way i handel open file in perl i have the following input file <File1> D33963|BNS Default Swap|-261564.923909249| D24484|BNS Default Swap|-53356.6868058492| D24485|BNS Default Swap|-21180.9904679111| D33965|BNS Default Swap|154181.478745804|... (6 Replies)
Discussion started by: kykyboss
6 Replies

8. Shell Programming and Scripting

Merge XML file (to same root)

HI I am looking for a easy way to merge 2 xml files like the following file 1: will have a structure like this <Group GID="TOTO" NAME="TOTO" UNITS="1.0"> <Property NAME="Id" VALUE="TOTO"/> <Property NAME="Currency" VALUE="USD"/> <Group... (6 Replies)
Discussion started by: kykyboss
6 Replies

9. 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

10. 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

11. 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

12. 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

13. 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

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

15. UNIX for Beginners Questions & Answers

Tail -f Command help

Hi Team, Can anyone help me here: I have to access server logs via putty and these logs file is a trailing file (continously updating) with ERROR and WARNINGS... I need to know if I can pull this trailing file to a local drive so that I can do some higlighting on some keywords through Notepad... (13 Replies)
Discussion started by: jitensetia
13 Replies