Date: Thu, 13 Jul 1995 18:13:12 -0700 From: asami@cs.berkeley.edu (Satoshi Asami) To: knarf@nasim.cube.net Cc: freebsd-ports@freebsd.org Subject: Re: diffs and checksums Message-ID: <199507140113.SAA25137@forgery.CS.Berkeley.EDU> In-Reply-To: <3u4dtm$rt5@nasim.nasim.cube.net> (knarf@nasim.cube.net)
next in thread | previous in thread | raw e-mail | index | archive | help
* Oh, I did not know this, I always thought only context diffs are
* accepted.
That's certainly not true, all the ports *I* did use -u
diffs.... :)
* The context is present and please don't tell me you don't see on the
* first view what is changed. ;) BTW: Unified diffs are much smaller as
* they don't contain the context twice (this is why the format is called
* "unified context diff" - see patch(1)).
That's true, and it's why I like -u diffs. But they can also do
things like (from utils/chord)
@@ -46,13 +46,14 @@
toc.o : chord.h
install : all
- cp $(PROGRAMS) $(BINDIR)
- rm -f $(MANDIR)/cat$(MANEXT)/chord.$(MANEXT)
+ install -c -s $(PROGRAMS) $(BINDIR)
cp chord.man $(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
- chmod 666 $(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
- Cp a2crd.man $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
- chmod 666 $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
-
+ chmod 444 $(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
+ gzip -9nf $(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
+ cp a2crd.man $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
+ chmod 444 $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
+ gzip -9nf $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
+
shar : $(SRC)
rm -f $(RELNAME).part*
shar -F -L 60 -o $(RELNAME).part $(SRC) $(INCL) $(SONGS) $(DOCS)
which requires a little imagination. A -c diff would have been easier
to read in this case.
Anyway, we are not going to force people to use one format of the
other, it's just a matter of preference and we should all accept that
some people are born with different kind of circuits in their
brains. :)
Satoshi
P.S. By the way, is there some way to convert a -u diff to -c or vice
versa? I took a look at man pages of diff and patch, but
couldn't find anything....
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199507140113.SAA25137>