On 22.10.12 20:41, Rom Walton wrote: > I suppose the next obstacle will be when we really are ready to do a complete > merge. But that is for another day...
> On 22.10.12 20:28, Nicolás Alvarez wrote: > (ugh, they are still using that stupid checkin_notes file?) Yes they do. Hopefully only until they realize that this _must_ unavoidably cause conflicts in every merge or cherry-pick they try. Seriously: drop that file. The information meant to be in it is redundant at best, in reality less reliable than what's available int the SCM (that's what an SCM tool is made for, right?) and it generates unnecessary dependencies between commits that every SCM guideline I came across recommends to avoid. Best, Bernd _______________________________________________ boinc_dev mailing list [email protected] http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
