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

Wolfgang Denk wd at denx.de
Tue Aug 7 08:48:48 CEST 2007


Dear Kim,

in message <20070806190637.e284487e.kim.phillips at freescale.com> you wrote:
> ..by placing board entries one per line, as suggested by jdl.


I understand the  intention,  but  at  least  for  me  it  is  pretty
counterproductive.  I  introduced the block formatting some years ago
when the number of boards grew, and the file grew too long.

For example, have a look at the 8xx boards. Here is the old version:

> -LIST_8xx="	\
> -	Adder87x	GENIETV		MBX860T		R360MPI		\
> -	AdderII		GTH		MHPC		RBC823		\
> -	ADS860		hermes		MPC86xADS	rmu		\
> -	AMX860		IAD210		MPC885ADS	RPXClassic	\
> -	c2mon		ICU862_100MHz	MVS1		RPXlite		\
> -	CCM		IP860		NETPHONE	RPXlite_DW	\
> -	cogent_mpc8xx	IVML24		NETTA		RRvision	\
> -	ELPT860		IVML24_128	NETTA2		SM850		\
> -	EP88x		IVML24_256	NETTA_ISDN	spc1920		\
> -	ESTEEM192E	IVMS8		NETVIA		SPD823TS	\
> -	ETX094		IVMS8_128	NETVIA_V2	svm_sc8xx	\
> -	FADS823		IVMS8_256	NX823		SXNI855T	\
> -	FADS850SAR	KUP4K		pcu_e		TOP860		\
> -	FADS860T	KUP4X		QS823		TQM823L		\
> -	FLAGADM		LANTEC		QS850		TQM823L_LCD	\
> -	FPS850L		lwmon		QS860T		TQM850L		\
> -	GEN860T		MBX		quantum		TQM855L		\
> -	GEN860T_SC					TQM860L		\
> -							TQM885D		\
> -							uc100		\
> -							v37		\

This fits easily all on a single screen.

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.

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 would like to keep the current formatting.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It seems intuitively obvious to me, which  means  that  it  might  be
wrong.                                                 -- Chris Torek




More information about the U-Boot mailing list