From owner-p4-projects@FreeBSD.ORG Fri Jul 4 20:30:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69A141065678; Fri, 4 Jul 2008 20:30:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DA78106564A for ; Fri, 4 Jul 2008 20:30:14 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1A14C8FC13 for ; Fri, 4 Jul 2008 20:30:14 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m64KUE4Z066341 for ; Fri, 4 Jul 2008 20:30:14 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m64KUEII066339 for perforce@freebsd.org; Fri, 4 Jul 2008 20:30:14 GMT (envelope-from gabor@freebsd.org) Date: Fri, 4 Jul 2008 20:30:14 GMT Message-Id: <200807042030.m64KUEII066339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2008 20:30:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=144662 Change 144662 by gabor@gabor_server on 2008/07/04 20:29:47 - Document recently added features - Fix typo - Add a new section for miscallenous options - Bump .Dd Affected files ... .. //depot/projects/soc2008/gabor_textproc/diff/diff.1#2 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/diff/diff.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" -.Dd Apr 7, 2008 +.Dd Jul 4, 2008 .Dt DIFF 1 .Os .Sh NAME @@ -78,6 +78,14 @@ .Ek .Ar dir1 dir2 .Nm diff +.Op Fl Fl from-file Ar file1 +.Ar file2 +.Op Ar file3 ... +.Nm diff +.Op Fl Fl to-file Ar file1 +.Ar file2 +.Op Ar file3 ... +.Nm diff .Op Fl v .Sh DESCRIPTION The @@ -161,6 +169,10 @@ insert or delete command. This is the form used by .Xr rcsdiff 1 . +.It Fl Fl normal +Produces a normal diff. +This is the default behaviour and this option is preserved for +compatibility. .It Fl q , Fl Fl brief Just print a line when the files differ. Does not output a list of changes. @@ -204,6 +216,14 @@ Try very hard to produce a diff as small as possible. This may consume a lot of processing power and memory when processing large files with many changes. +.It Fl Fl from-file Ns = Ns Ar file +Takes +.Ar file +as a source of comparison and compares each argument to +.Ar file . +The +.Ar file +argument can be a directory. .It Fl I Ar pattern , Fl Fl ignore-matching-lines Ns = Ns Ar pattern Ignores changes, insertions, and deletions whose lines match the extended regular expression @@ -253,6 +273,14 @@ the indentation of the original source lines and make the output listing difficult to interpret. This option will preserve the original source's indentation. +.It Fl Fl to-file Ns = Ns file +Takes +.Ar file +as a destination of comparison and compares each argument to +.Ar file . +The +.Ar file +argument can be a directory. .It Fl w , Fl Fl ignore-all-space Is similar to .Fl b @@ -265,9 +293,14 @@ .Pp Directory comparison options: .Bl -tag -width Ds +.It Fl Fl ignore-file-name-case +Ignore the file name cases when comparing directories. .It Fl N , Fl Fl new-file If a file is found in only one directory, act as if it was found in the other directory too but was of zero size. +.It Fl Fl no-ignore-file-name-case +Compare directories with case sensitivity. +This is the default. .It Fl P If a file is found only in .Ar dir2 , @@ -302,8 +335,14 @@ Multiple .Fl x options may be specified. +.El +.Pp +Miscallenaous options: +.Bl -tag -width Ds +.It Fl Fl help +Prints usage info. .It Fl v , Fl Fl version -Print version ino. +Prints version info. .El .Pp If both arguments are directories,