Date: Tue, 11 Jul 2000 17:48:34 -0700 From: Wilfredo S=?iso-8859-1?q?=E1?=nchez <wsanchez@apple.com> To: Bruce Evans <bde@zeta.org.au> Cc: cvs-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/usr.bin/make arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c make.c parse.c str.c suff.c targ.c util.c var.c Message-ID: <200007120048.RAA09917@scv3.apple.com>
next in thread | raw e-mail | index | archive | help
| [Please format paragraphs with somewhat less than 520 columns.]=20
I can try to wrap, but I'd have to do so by hand. But wrapping text =
at
the sender's end is not the right thing. Your mail client is broken, as
it should wrap for you. You might try fixing that rather than expecting
everyone to hard-wrap text for you. Some of us like letting our clients
wrap the text for us as we change the window size.
| They were mostly related to _wrong_ $Id$ vs. $FreeBSD$ keyword =
changes, and=20
| the backing out of these ... :-). I don't want this history to be =
repeated.=20
Sure.
| History:=20
| Round 1: premature "long-awaited" change from $Id$ to $FreeBSD$ by jkh =
and=20
| backout of this change by peter. Affected most of the src =
tree.=20
| Round 2: (for make sources only; interleaved with round 3). Add $Id$.=20=
| Get it wrong by duplicating $Id$, then remove one of the =
copies.=20
| Round 3: premature change from $Id$ to $FreeBSD$ by obrien in parts of=20=
| contrib and/ir ports while core was still discussing the =
correct=20
| format for the expansion of $FreeBSD$. Fait accompli. Change=20=
| completed by peter. End up with ugly (IMHO) formatting with=20
| fairly full pathname of the file in the expansion of $FreeBSD.=20=
| I hope this round has not actually ended :-).=20
OK.
| Round 4: (for make sources only). Start using __RCSID().=20
Certainly we should do the same everywhere, assuming it's correct, =
which
I think it is. I'll even volunteer to do it, but it'll be a while =
before I
would get to do so. In the meantime, fixing them as I find them seems
reasonable.
| Swapping the Berkeley Id into the comment makes the diffs relative to =
the=20
| Berkeley version harder to read.=20
So does $Id$ -> $FreeBSD$, and the move to the comment is nearby, so =
you
still end up with one hunk:
[joliet-jake:bsdmake/bsdmake/make] wsanchez% cvs diff -r CSRG =
lst.lib/lstSucc.c
Index: lst.lib/lstSucc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.bin/make/lst.lib/lstSucc.c,v
retrieving revision 1.1.1.4
retrieving revision 1.6
diff -u -d -b -w -r1.1.1.4 -r1.6
--- lst.lib/lstSucc.c 1997/07/06 06:52:26 1.1.1.4
+++ lst.lib/lstSucc.c 2000/07/09 00:08:47 1.6
@@ -32,10 +32,13 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN =
ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY =
OF
* SUCH DAMAGE.
+ *
+ * @(#)lstSucc.c 8.1 (Berkeley) 6/6/93
*/
=20
#ifndef lint
-static char sccsid[] =3D "@(#)lstSucc.c 8.2 (Berkeley) 4/28/95";
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD: src/usr.bin/make/lst.lib/lstSucc.c,v 1.6 2000/07/09 =
00:08:47 wsanchez Exp $");
#endif /* not lint */
=20
/*-
Before my change, you had:
Index: lst.lib/lstSucc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.bin/make/lst.lib/lstSucc.c,v
retrieving revision 1.5
retrieving revision 1.1.1.4
diff -u -d -b -w -r1.5 -r1.1.1.4
--- lst.lib/lstSucc.c 1999/08/28 01:03:57 1.5
+++ lst.lib/lstSucc.c 1997/07/06 06:52:26 1.1.1.4
@@ -32,12 +32,10 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN =
ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY =
OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/usr.bin/make/lst.lib/lstSucc.c,v 1.5 1999/08/28 =
01:03:57 peter Exp $
*/
=20
#ifndef lint
-static char sccsid[] =3D "@(#)lstSucc.c 8.1 (Berkeley) 6/6/93";
+static char sccsid[] =3D "@(#)lstSucc.c 8.2 (Berkeley) 4/28/95";
#endif /* not lint */
=20
/*-
Which isn't looking a whole lot simpler. In fact, in that example, =
you
have to go all the way back to revision 1.1 before the diff is only in =
the
sccsid line.
In any case, I still think using the macro is a good thing, and it =
makes
the code easier to manage, and lets us deal with different compilers =
more
happily, etc. I certainly wouldn't advocate reformatting the code just =
for
grins, but saying that such changes are bad because they make the diffs
bigger is not a very compelling argument.
-Fred
Wilfredo S=E1nchez, wsanchez@apple.com
Open Source Engineering Lead
Apple Computer, Inc., Core Operating System Group
1 Infinite Loop, Cupertino, CA 94086, 408.974-5174
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200007120048.RAA09917>