[U-Boot-Users] [PATCH] make MAKEALL more immune to merge conflicts

[Kim Phillips]

On Tue, 07 Aug 2007 08:48:48 +0200
Wolfgang Denk <wd at denx.de> wrote:

> > -	FPS850L		lwmon		QS860T		TQM850L		\
> > -	GEN860T		MBX		quantum		TQM855L		\
> > -	GEN860T_SC					TQM860L		\
> > -							TQM885D		\
> > -							uc100		\
> > -							v37		\
> This fits easily all on a single screen.

I can't imagine the level of pain one would have to (unnecessarily)
endure resolving a conflict in the 8xx list (the columns don't even
have equal lengths).

> Now your list version is about 4 times as long, and needs more than 2
> pages on the (pretty big) window size I'm using. That's much harder to
> read.

true, but at least it's sorted alpha now.

> As for the merge conflict problem: yes,  this  happens  occasionally,
> but not very frequently, and this type of merge conflicts are easy to
> resolve.

I'd rather say adieu to them period, given the number of trees one has
to merge to get what u-boot code they want these days.

> I would like to keep the current formatting.
> 

I think you're placing too much emphasis over your /static/
aesthetics over the aesthetics of /change/, e.g. here's a patch I'm
about to send you (assuming you apply this patch):

>From 40f9d74666e8f521ae1d64f5b34792f7c03d883b Mon Sep 17 00:00:00 2001
From: Kim Phillips <kim.phillips at freescale.com>
Date: Mon, 6 Aug 2007 18:46:13 -0500
Subject: [PATCH] mpc83xx: add the mpc8323erdb to MAKEALL

Signed-off-by: Kim Phillips <kim.phillips at freescale.com>
---
 MAKEALL |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/MAKEALL b/MAKEALL
index b69b6bf..def4f65 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -294,6 +294,7 @@ LIST_8260="         \
 LIST_83xx="            \
        MPC8313ERDB_33  \
        MPC8313ERDB_66  \
+       MPC8323ERDB     \
        MPC832XEMDS     \
        MPC8349EMDS     \
        MPC8349ITX      \
-- 

isn't that beautiful?  You can tell /exactly/ what's going on, instead
of having to check whether a board got erroneously dropped via a snafu
in someone's editor acrobatics.

If you want, and believe e.g, the 8xx series won't be getting any
changes in the future, I can respin leaving the 8xx alone (let me know
if there are others).

> Best regards,

you too.

> Wolfgang Denk

Kim