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

[David Saada]

I would like to point out another thing that bothers me here: Whenever I take
the most up to date version of U-Boot, I need to perform a merge on MAKEALL,
as my local version includes the names of all my custom boards. I guess I'm
not the only one bothered by this. I suggest that each processor family line
in MAKEALL will hold an additional "external boards" variable, which will
hold a list of all the external boards (for this family). The value of this
variable should be achieved from an "external boards" makefile, included by
MAKEALL. This file is obviously empty in the U-boot repository, and filled
with one's own custom boards elsewhere. 
Just my two cents.
David.


Martin Krause wrote:
> 
> u-boot-users-bounces at lists.sourceforge.net wrote on :
>> Hi Wolfgang,
>> 
>> On Tuesday 07 August 2007, Wolfgang Denk wrote:
>> > 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 happens to me quite often and I don't see a big advantage in the
>> overview view for all the boards on one page.
> 
> Me too.
> 
>> > I would like to keep the current formatting.
>> 
>> I vote for the new, single-line version suggested by Kim & Jon.
> 
> Me too!
> 
> Best Regards,
> 
> Martin Krause
> --
> TQ-Systems GmbH
> Muehlstrasse 2, Gut Delling, D-82229 Seefeld
> Amtsgericht Muenchen, HRB 105 018, UST-IdNr. DE 811 607 913
> Geschaeftsfuehrer: Dipl.-Ing. (FH) Detlef Schneider, Dipl.-Ing. (FH)
> Ruediger Stahl
> http://www.tq-group.com
> 
> -------------------------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc.
> Still grepping through log files to find problems?  Stop.
> Now Search log events and configuration files using AJAX and a browser.
> Download your FREE copy of Splunk now >>  http://get.splunk.com/
> _______________________________________________
> U-Boot-Users mailing list
> U-Boot-Users at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/u-boot-users
> 
> 

-- 
View this message in context: http://www.nabble.com/-PATCH--make-MAKEALL-more-immune-to-merge-conflicts-tf4227360.html#a12052243
Sent from the Uboot - Users mailing list archive at Nabble.com.