Linux and UNIX Man Pages

Linux & Unix Commands - Search Man Pages

svk::editor::merge(3) [osx 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)

Check Out this Related Man Page

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

SVK::Command::Cmerge - Merge specific changes SYNOPSIS
This command is currently deprecated, pending improvements to the Subversion API. In the meantime, use C<svk merge -c> to obtain similar functionality. cmerge -c CHGSPEC DEPOTPATH [PATH] cmerge -c CHGSPEC DEPOTPATH1 DEPOTPATH2 OPTIONS
-c [--change] REV : act on comma-separated revisions REV -l [--log] : use logs of merged revisions as commit message -r [--revision] N:M : act on revisions between N and M -a [--auto] : merge from the previous merge point --verbatim : verbatim merge log without indents and header --no-ticket : do not record this merge point -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::Cmerge(3)
Man Page

14 More Discussions You Might Find Interesting

1. Solaris

vi editor

suppose i have a lines as follows -rw-r----- 1 ora92 orainst 104846848 Jan 15 2005 0001_0000003971.arc -rw-r----- 1 ora92 orainst 104851456 Jan 15 2005 0001_0000003972.arc -rw-r----- 1 ora92 orainst 104852992 Jan 15 2005 0001_0000003973.arc -rw-r----- 1 ora92 orainst... (15 Replies)
Discussion started by: diptiman
15 Replies

2. UNIX for Advanced & Expert Users

Unable to open files in VI editor

Hi, I unable to open any file using Vi editor,constantly getting the following error, vi log.log *** glibc detected *** malloc(): memory corruption: 0x081af510 ** uname -a Linux sekac092 2.6.5-7.244-bigsmp #1 SMP Mon Dec 12 18:32:25 UTC 2005 i686 athlon i386 GNU/Linux Also Note ls... (8 Replies)
Discussion started by: ennstate
8 Replies

3. UNIX for Dummies Questions & Answers

Tree directory structure of Unix to get final node path

Hi, I want to list all the last directories from mentioned base path. for eg: If i have a base path say /base/base1/ How can i get the path till last node in tree like directory structure of unix by applying any command. so that i will get following output. ... (7 Replies)
Discussion started by: Shiv@jad
7 Replies

4. UNIX for Advanced & Expert Users

more than 1 vi editor

Hi, What's the process to open 2 vi editor at a same time. Plz let me know. Thanx (5 Replies)
Discussion started by: reply2soumya
5 Replies

5. Shell Programming and Scripting

VI Editor - question for unix gurus !!

I have created a dummy file -demo.txt On my machine-A (oslevel-5300-08) I can display the file content in HEX format through VI editor using :%!xxd but on other machine-B (oslevel - 5300-06) , I get error as "sh: xxd: not found." machine-A: $ cat demo.txt Hello World ! I can display... (7 Replies)
Discussion started by: Rahulpict
7 Replies

6. Shell Programming and Scripting

Merge multiline into Singleline

Hi, I'm newbie in this forum and I already searched regarding Merge multiline into singleline but I always found different result which is I don't want it like i want. Here is the data that i have it: *** ALARM 711 A1/BTS "MAD08B1 08ACPA0"U 090604 1040 RADIO X-CEIVER ADMINISTRATION BTS... (5 Replies)
Discussion started by: inteliduy
5 Replies

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

8. HP-UX

Vi editor issue

When I open vi editor and close it , the content of the vi editor is shown in console even after closing. Same is happening for manpages also.. Can anyone let me know how to solve the issue .. $uname -a HP-UX <servr_name> B.11.11 U 9000/800 657359313 unlimited-user license ... (6 Replies)
Discussion started by: soumyabubun
6 Replies

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

10. UNIX for Dummies Questions & Answers

Vi Editor

I have recently installed ubuntu 11.10 version in my laptop. Please tell me how to use the vi editor. Because the vi editor in ubuntu is totally different from the vi editor we have in Mandriva or Sabayon. Why am i not able to use backspace or the cursor movement keys(up, down, left, right)... (6 Replies)
Discussion started by: Sudip_Felipemas
6 Replies

11. UNIX for Dummies Questions & Answers

VIM Editor - To disable the status on existing

When i exist the vim editor .. to gives '0' in the console... i think it is status of the exit.. How to disable that ... (14 Replies)
Discussion started by: greenworld123
14 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. Web Development

Bootstrap Changes to Advanced Editor and Attachments Form

I changed the CSS and Javascript in the "Advanced Editor" to clean it up. This is also the editor seen in "New Thread" and "New Reply". Basically I got rid of the mouseover style changes which were messed up due to vB legacy JS code from a decade ago. While doing this change, I then completed... (8 Replies)
Discussion started by: Neo
8 Replies

14. Web Development

New Font Awesome Icons in Quick Reply Editor

Working on the Quick Reply Editor, I have replaced a number of icons (see image below) with Font Awesome Icons. Was planning to replace all of them, but for some reason, replacing a few of them causes the script / template to break (which is odd) so I left them for now. ... (6 Replies)
Discussion started by: Neo
6 Replies

Featured Tech Videos