12-07-2009
It (probably) means that you've got an unified diff, most probably made by GNU diff, where the following text shows the difference between 14 lines of the original file, starting at line 617, versus 8 total lines of the new file, also starting at line 617. So in total, at least 6 lines were deleted, and the others might also have been changed.
Last edited by pludi; 12-07-2009 at 04:06 AM..
Reason: Typo
9 More Discussions You Might Find Interesting
1. HP-UX
Hello,
I have to apply the patch PHSS_24302 on HPUX B.11.11 os version. When i look at the /var/adm/sw/swagentd.log it mentions that "this is not a valid depot". I downloaded the patch from HP web site. Please get back to me at the earliest as I'm dead in the water. Thanks,
Balaji K (3 Replies)
Discussion started by: bkrish
3 Replies
2. Shell Programming and Scripting
Dear Guys ,
I use Linux Red Hat 9 ..
i installed a patch for a web mail i use , and i think it make a damage for my web mail i cannot see it anymore .
i get so many error messages .
what i want to ask is there any command on linux i can use to remove the patch !!!
i want to remove the... (1 Reply)
Discussion started by: tamemi
1 Replies
3. UNIX for Dummies Questions & Answers
Dear All ,
I have Sun Solaries 7 sparc server ... am runing perl , CGI , MD5 ... etc for new web mail am setting up .
now i have to install the patch ( xyz.pl.patch ) against a perl file for ex. xxx.pl
what exact command i have to use ,,, also i do not want to make damage for my system... (6 Replies)
Discussion started by: tamemi
6 Replies
4. IP Networking
Hello friends I'm running Redhat 9.0 with linux kernel 2.4.20-8 & have iptables version 1.2.7a & encountering a problem that I narrate down.
I need to apply patch to my iptable and netfilter for connection tracking and load balancing that are available in patch-o-matic distribution by netfilter.... (0 Replies)
Discussion started by: Rakesh Ranjan
0 Replies
5. Solaris
Hello...
I'm looking for latest patch for automount and what it does on Solaris8, Thanks! :confused: (2 Replies)
Discussion started by: catwomen
2 Replies
6. Solaris
I have to update on solaris 9. UPdating to 10 is not an option. Can I create a disk that will have all the updates/patches and just run it once and not sit and update one by one? If so, how? I have 10 Sun systems. (1 Reply)
Discussion started by: disturbe_d
1 Replies
7. Linux
Hi
Do let me know how to find OS Patch 's installed on Linux server ?
Thanks
~ SPai (3 Replies)
Discussion started by: sbanala
3 Replies
8. Red Hat
Hi,
Is there any command to know the patch version?Suppose i installed RTlinux patch in rethat linux.How can i know the patch version installed?Any helps appreciated.
Thanks,
Sathi. (2 Replies)
Discussion started by: sathiyaraj V
2 Replies
9. HP-UX
Hi guys,
Question:
I downloaded a security update for samba:
samba-3.0.7-CAN-2004-0882.patch
The question is how can I get in installed? I cannot find instructions anywhere and it is not a tar file.
Little help? (1 Reply)
Discussion started by: 300zxmuro
1 Replies
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)