Issue #2606 has been updated by kAworu. File 0001-update-to-bmake-20131001.patch added File 0002-bmake-Revert-local-modification-patches.patch added File 0003-bmake-new-local-modifications.patch added File 0004-bmake-added-new-README.DELETED-README.DRAGONFLY-and-.patch added
marino wrote: > Just going off the titles (I'll look in depth later), it seems some of these > could be combined. > e.g. 0004 and 0005 could be flattened into one. > 0003, 0006, and 0007 could be flattened into one. > > so the master branch would see: > A) local modifications reverted > B) trivial merge with vendor/BMAKE > C) new local modifications added back > D) README.DELETED, README.DRAGONFLY, usr.bin/bmake/* all added in the same > commit > > (This minimizes the number of commits in which the master branch is "broken") Sure, I've come up with a cleaner patchset as you described (see attachments). I don't fully understand why the branch merge is still the first patch although I did revert local modification patches *first* and then did the merge, as with the first time `git format-patch master' has produced the merge as first patch. Also for bmake I found out that we could remove the mk/ directory, but I don't know if it is worth the (re)work. ---------------------------------------- Submit #2606: [PATCH] update contrib/bmake to bmake-20131001 http://bugs.dragonflybsd.org/issues/2606#change-11647 * Author: kAworu * Status: New * Priority: Low * Assignee: marino * Category: * Target version: ---------------------------------------- Update bmake to the latest version. -- You have received this notification because you have either subscribed to it, or are involved in it. To change your notification preferences, please click here: http://bugs.dragonflybsd.org/my/account
