GSP
Quick Navigator

Search Site

Unix VPS
A - Starter
B - Basic
C - Preferred
D - Commercial
MPS - Dedicated
Previous VPSs
* Sign Up! *

Support
Contact Us
Online Help
Handbooks
Domain Status
Man Pages

FAQ
Virtual Servers
Pricing
Billing
Technical

Network
Facilities
Connectivity
Topology Map

Miscellaneous
Server Agreement
Year 2038
Credits
 

USA Flag

 

 

Man Pages


Manual Reference Pages  -  FIXCVSDIFF (1)

.ds Aq ’

NAME

fixcvsdiff - fix problematic diff files

CONTENTS

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 \(lqIndex:\(rq 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
Search for    or go to Top of page |  Section 1 |  Main Index


patchutils FIXCVSDIFF (1) 7 Dec 2001

Powered by GSP Visit the GSP FreeBSD Man Page Interface.
Output converted with manServer 1.07.