FIXCVSDIFF(1) Man pages FIXCVSDIFF(1)NAME
fixcvsdiff - fix problematic diff files
SYNOPSIS
fixcvsdiff [-p] [-b] [file...]
DESCRIPTION
fixcvsdiff modifies diff files created from the cvs diff command, where files have been added or removed. CVS tends to create diff files
that patch(1) mis-interprets. The diff file must retain the lines beginning with "Index:" in order for the correction to work.
OPTIONS -b
Keep a .bak backup file.
-p
Print out the cvs add and cvs remove commands that must be made after applying the diff, but before running cvs commit.
SEE ALSO diff(1), patch(1), cvs(1)AUTHORS
Tim Waugh <twaugh@redhat.com>
Package maintainer
Amir Karger <karger@post.harvard.edu>
Author of the original perl script and man page
John Levon <moz@compsoc.man.ac.uk>
Author of the original perl script and man page
patchutils 7 Dec 2001 FIXCVSDIFF(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)
Hi all,
I want to create a new user and grant him ONLY transfer files access to a specific directory where he can only upload and read the files. He should be restricted to this activity only.
Regards (6 Replies)
Hi everyone,
I know the following questions are noobish questions but I am asking them because I am confused about the basics of history behind UNIX and LINUX.
Ok onto business, my questions are-:
Was/Is UNIX ever an open source operating system ?
If UNIX was... (21 Replies)
Hi,
Last 2 weeks I have searched many forums and i haven't found the answer for the question:
How to get all command output to Putty title?
Needed it for other programs to know when some jobs on a server is done and is it done right or wrong. Plink stdout and stdin wasn't working, i used many... (1 Reply)
anyone have any idea how do to this with auth_attr?
I suspect if I grant him
solaris.device.:RO::Device Allocation::help=DevAllocHeader.html
that will work but I'm unsure. Just looking for a second opinion. (10 Replies)
I am looking for a stable, reliable system to replace my current Windows systems in the home. These are simple systems that I purchased from the local Big Box store.
I have heard many good things about Unix and it's various children and it sounds like a good option to me. I have worked... (2 Replies)
We have a lot of scripts using cut as :
cut -c 0-8 --works for cut (GNU coreutils) 5.97, but does not work for cut (GNU coreutils) 8.4.
Gives error -
cut: fields and positions are numbered from 1
Try `cut --help' for more information.
The position needs to start with 1 for later... (6 Replies)
I've got a problem with a proxy configuration. We have an LDAP group that lists all users who are authorised to use the proxy to FTP (usually Filezilla) out to the world, and by implication those not in the group should be denied. My users are delighted that this has been enabled and those that... (9 Replies)
hi folks,
how to using tar with exclude directory and compress it using tar.Z
i only know how to exclude dir only with this command below:
tar -cvf /varios/restore/test.tar -X excludefile.txt /jfma/test1/
how to compress it using 1 command?
Thanx
Please use CODE tags as... (6 Replies)
Hello All,
I had recently learnt a bit of Docker(which provides containerization process).
Here are some of my learning points from it.
Let us start first with very basic question:
What is Docker:
Docker is a platform for sysadmins and developers to DEPLOY, DEVELOP and RUN applications ... (7 Replies)
What is the point of this? Whenever I close my shell it appends to the history file without adding this. I have never seen it overwrite my history file.
# When the shell exits, append to the history file instead of overwriting it
shopt -s histappend (3 Replies)
Hello for all,
I am testing the behavior of a 32 bit application running on Solaris 5.10 (SPARC), and realize it reaches 4GB of memory and then crashes.
It doesn't matter the amount of used memory as application is intended to perform many transactions; rather, what I want to achieve is to... (2 Replies)