Visit The New, Modern Unix Linux Community

Linux and UNIX Man Pages

Test Your Knowledge in Computers #567
Difficulty: Medium
The ternary if-then-else operator generally has the following syntax: E ? X : Y where E is a Boolean expression and if true, the statement is assigned the value Y.
True or False?
Linux & Unix Commands - Search Man Pages

rediff(1) [redhat man page]

REDIFF(1)																 REDIFF(1)

NAME
rediff, editdiff - fix offsets and counts of a hand-edited diff SYNOPSIS
rediff ORIGINAL EDITED rediff EDITED rediff {--help | --version} editdiff FILE editdiff {--help | --version} DESCRIPTION
You can use rediff to correct a hand-edited unified diff. Take a copy of the diff you want to edit, and edit it without changing any off- sets or counts (the lines that begin ``@@''). Then run rediff, telling it the name of the original diff file and the name of the one you have edited, and it will output the edited diff file but with corrected offsets and counts. A small script, editdiff, is provided for editing a diff file in-place. The types of changes that are currently handled are: o Modifying the text of any file content line (of course). o Adding new line insertions or deletions. o Adding, changing or removing context lines. Lines at the context horizon are dealt with by adjusting the offset and/or count. o Adding a single hunk (@@-prefixed section). o Removing multiple hunk (@@-prefixed sections). Alternatively, if only one argument is provided, it is taken to be the edited file and the counts and offsets are adjusted as appropriate. Some assumptions are made when used in this mode. See recountdiff(1) for more information. OPTIONS
--help Display a short usage message. --version Display the version number of rediff. SEE ALSO
interdiff(1), recountdiff(1) AUTHOR
Tim Waugh <twaugh@redhat.com>. patchutils 13 May 2002 REDIFF(1)

Check Out this Related Man Page

REDIFF(1)							     Man pages								 REDIFF(1)

NAME
rediff, editdiff - fix offsets and counts of a hand-edited diff SYNOPSIS
rediff ORIGINAL EDITED rediff EDITED rediff {[--help] | [--version]} editdiff FILE editdiff {[--help] | [--version]} DESCRIPTION
You can use rediff to correct a hand-edited unified diff. Take a copy of the diff you want to edit, and edit it without changing any offsets or counts (the lines that begin "@@"). Then run rediff, telling it the name of the original diff file and the name of the one you have edited, and it will output the edited diff file but with corrected offsets and counts. A small script, editdiff, is provided for editing a diff file in-place. The types of changes that are currently handled are: o Modifying the text of any file content line (of course). o Adding new line insertions or deletions. o Adding, changing or removing context lines. Lines at the context horizon are dealt with by adjusting the offset and/or count. o Adding a single hunk (@@-prefixed section). o Removing multiple hunk (@@-prefixed sections). Alternatively, if only one argument is provided, it is taken to be the edited file and the counts and offsets are adjusted as appropriate. Some assumptions are made when used in this mode. See recountdiff(1) for more information. OPTIONS
--help Display a short usage message. --version Display the version number of rediff. SEE ALSO
interdiff(1), recountdiff(1) AUTHOR
Tim Waugh <twaugh@redhat.com> Package maintainer patchutils 13 May 2002 REDIFF(1)

14 More Discussions You Might Find Interesting

1. Shell Programming and Scripting

SED query

I'm writing a script which word counts the number of lines in two files. If one file is bigger than the other I'd like to edit one of the files to delete some lines to make both the same. It does not matter where in the file the lines are deleted from. It's expected that this will be ran from... (3 Replies)
Discussion started by: chog1010
3 Replies

2. UNIX for Dummies Questions & Answers

Removing lines that are (same in content) based on columns

I have a file which looks like AA BB CC DD EE FF GG HH KK AA BB GG HH KK FF CC DD EE AA BB CC DD EE UU VV XX ZZ AA BB VV XX ZZ UU CC DD EE .... I want the script to give me only one line based on duplicate contents: AA BB CC DD EE FF GG HH KK AA BB CC DD EE UU VV XX ZZ (7 Replies)
Discussion started by: adsforall
7 Replies

3. Shell Programming and Scripting

Rename a file after the name of its parent dir

Started a thread in beginners but I thought someone from this forum may have an idea as well. Thanks! EDITED BY REBORG (3 Replies)
Discussion started by: robotsbite
3 Replies

4. Shell Programming and Scripting

Help in unix in awk

Hi, I have a file as given below $cat int_check 239|adf123@yahoo.com|999e 23e|get@rediff.com|987 233|get@rediff.com|987 I am running the command as given to find whether field 1 and 3 have proper integer values or not. awk -F'|' 'int($1)!=$1 || int($3)!=$3' int_check... (7 Replies)
Discussion started by: ashwin3086
7 Replies

5. Shell Programming and Scripting

Modifying a file without changing inode number

Hi all, I am struggling to change the content of a file without changing the inode number. The exact issue is as below. I have a file name test.bak which has 100 lines of text. I am trying to to delete the first 90 lines of the text in the file. I know that using sed/awk/head/tail I can... (3 Replies)
Discussion started by: sathishkmrv
3 Replies

6. Shell Programming and Scripting

Need to combine counts from diff files

Ok i have a script that goes into the last 3 files, grabs a value from that file which is a date, counts the number of results of that date. So this is the output: FILED001.20110407.175709.086912 49995 04-07T12 4 04-07T07 1 04-07T17 FILED001.20110407.180111.086913 50000 04-07T12 ... (5 Replies)
Discussion started by: cinderella
5 Replies

7. Shell Programming and Scripting

HELP With Function

I am writing a script that requires to have a function that counts up and counts down but I am having this problem if anybody could help me I would appreciate it. The problem is when I run the script it gives me this message " syntax error near unexpected token 'done' this code is on line 11 and... (2 Replies)
Discussion started by: Emin_Em
2 Replies

8. Shell Programming and Scripting

Filtering a file for unique entries

Hi All, I am trying to filter out a txt file containing 2 columns. Which has got website name and response time as below. Website_name response_time yahoo 22 google 21 yahoo 34 rediff 45 google 43 rediff 31 I want filter the above file with unique website names which has got highest... (5 Replies)
Discussion started by: anilreddy103
5 Replies

9. Shell Programming and Scripting

[string processing]Adding new line in file

I have a report file which somewhere has a lines starting with word ".sub" I have a new variable named $new. What i am trying to do is insert the content of $new just before the occurrence of ".sub" in the report file. How can I do that? (11 Replies)
Discussion started by: animesharma
11 Replies

10. Programming

PERL:Combining multiple lines to single line

Hi All I need a small help for the below format in making a small script in Perl or Shell. I have a file in which a single line entries are broken into three line entries. Eg: I have a pen and notebook. All i want is to capture in a single line in a separate file. eg: I have a pen and... (4 Replies)
Discussion started by: Kalaiela
4 Replies

11. Shell Programming and Scripting

Adding a lines to specific section of the file.

Hello, I have to a add 2 lines to /etc/sudoers file under this section below, can someone please suggest script to add these two lines when execute this remotely on to a multiple servers. before ## Allow root to run any commands anywhere root ALL=(ALL) ALL After ## Allow root... (2 Replies)
Discussion started by: bobby320
2 Replies

12. UNIX for Dummies Questions & Answers

awk adding counts together from column

Hello Im new treat me nicely, I have a headache :) I have a script that seemed to work now it doesnt anyway, the last part is adding counts of unique items in a csv file eg 05492U34 38 05492U34 47 two columns, (many different values like this in file) i want... (7 Replies)
Discussion started by: aniquebmx
7 Replies

13. UNIX for Dummies Questions & Answers

Adding a new line after a specific line with sed

(5 Replies)
Discussion started by: gotamp
5 Replies

14. UNIX for Beginners Questions & Answers

Cut two individual position and summ

Hi All, I am having a huge file file. I need to cut the below column and do the below calculation I did the below command and able to do on full databased no on the individual based any help on doing each row by row cut -c 52-56 myfile | awk '{total = total + $1}END{print total}'... (7 Replies)
Discussion started by: arunkumar_mca
7 Replies

Featured Tech Videos