Xref: utzoo comp.sources.d:1623 rec.games.hack:1888 Path: utzoo!utgpu!water!watmath!clyde!cbosgd!mandrill!hal!ncoast!allbery From: allbery@ncoast.UUCP (Brandon Allbery) Newsgroups: comp.sources.d,rec.games.hack Subject: Re: A fun little burrowing diff Message-ID: <6900@ncoast.UUCP> Date: 26 Dec 87 02:22:01 GMT References: <12253@sci.UUCP> <322@gauss.rutgers.edu> Reply-To: allbery@ncoast.UUCP (Brandon Allbery) Organization: Cleveland Public Access UN*X, Cleveland, Oh Lines: 27 As quoted from <322@gauss.rutgers.edu> by linhart@gauss.rutgers.edu (D-ro 3): +--------------- | In article <12253@sci.UUCP> richd@sci.UUCP (Rich doherty) writes: | >1) I have no idea the "right" way to diff, having never used patch | > or any other net programs designed to make such things easy. | > So it is standard diff(1) output. | | You had the right idea, you just didn't look at the switches. | The right way to diff is to use the -c switch to make a context | difference, which changes lines when the lines around it match, rather | than an ed diff, which changes lines by line number. An ed diff can | screw up an already-modified file. Also, the -b switch will keep diff | from including lines where you only changed the number of spaces in | indentations and such. +--------------- ...assuming he's running 4.xBSD instead of System V, Xenix, Microport, V7, et cetera ad nauseam.... Would someone please post a PD diff which supports -c and -b? System V has neither option. I've got "diffc" on ncoast (converts diff output into diff -c output), but it still doesn't handle -b and it's the OLD (4.2) diff -c rather than the NEW (4.3BSD) diff -c. -- Brandon S. Allbery, Moderator of comp.sources.misc {hoptoad,harvard!necntc,cbosgd,sun!mandrill!hal,uunet!hnsurg3}!ncoast!allbery [This space reserved for future quotes and similar brain twisters.]