patchutils 0.3.1 (Stable branch)


 
Thread Tools Search this Thread
Special Forums News, Links, Events and Announcements Software Releases - RSS News patchutils 0.3.1 (Stable branch)
# 1  
Old 01-23-2009
patchutils 0.3.1 (Stable branch)

Patchutils contains a collection of tools formanipulating patch files: interdiff, combinediff,flipdiff, filterdiff, fixcvsdiff, rediff, lsdiff, grepdiff,splitdiff, recountdiff, and unwrapdiff. You canuse interdiff to create an incremental patchbetween two patches that are against a commonsource tree, combinediff for creating acumulative diff from two incremental patches, andflipdiff to transpose two incremental patches.Filterdiff is for extracting or excluding patchesfrom a patch set based on modified files matchingshell wildcards. Lsdiff lists modified files in apatch. Rediff, recountdiff, and unwrapdiff correcthand-edited (or otherwise broken) patches.License: GNU General Public License (GPL)Changes:
The TMPDIR environment variable is now respected. A rediff assertion failure has been fixed. The editdiff program now retains marker comments. GNU-style long names are now available for most options.Image

Image

More...
Login or Register to Ask a Question

Previous Thread | Next Thread
Login or Register to Ask a Question
LSDIFF(1)																 LSDIFF(1)

NAME
lsdiff - show which files are modified by a patch SYNOPSIS
lsdiff [-n] [-p n] [--strip=n] [--addprefix=PREFIX] [-s] [-i PATTERN] [-x PATTERN] [-v] [file...] lsdiff {--help | --version | --filter ... | --grep ...} DESCRIPTION
List the files modified by a patch. You can use both unified and context format diffs with this program. OPTIONS
-n Display the line number that each patch begins at. If verbose output is requested, each hunk of each patch is listed as well. For each file that is modified, a line is generated containing the line number of the beginning of the patch, followed by a Tab character, followed by the name of the file that is modified. If -v is given, following each of these lines will be one line for each hunk, consisting of a Tab character, the line number that the hunk begins at, another Tab character, the string ``Hunk #'', and the hunk number (starting at 1). -p n When matching, ignore the first n components of the pathname. --strip=n Remove the first n components of the pathname before displaying it. --addprefix=PREFIX Prefix the pathname with PREFIX before displaying it. -s Show file additions, modifications and removals. A file addition is indicated by a ``+'', a removal by a ``-'', and a modification by a ``!''. -i PATTERN Include only files matching PATTERN. -x PATTERN Exclude files matching PATTERN. -v Verbose output. --help Display a short usage message. --version Display the version number of lsdiff. --filter Behave like filterdiff(1) instead. --grep Behave like grepdiff(1) instead. SEE ALSO
filterdiff(1), grepdiff(1) EXAMPLES
To sort the order of touched files in a patch, you can use: lsdiff patch | sort -u | xargs -rn1 filterdiff patch -i To show only added files in a patch: lsdiff -s patch | grep '^+' | cut -c2- | xargs -rn1 filterdiff patch -i To show the headers of all file hunks: lsdiff -n patch | (while read n file do sed -ne "$n,$(($n+1))p" patch done) AUTHOR
Tim Waugh <twaugh@redhat.com>. patchutils 13 May 2002 LSDIFF(1)