On 10 May 2015 at 22:47, Mark Johnston <[email protected]> wrote: > > I've caught several cases (specifically in merging DTrace code) where the > upstream code block is so large the merger didn't even notice the > #ifndef __FreeBSD__ was present and thought that the merge was fine because > the upstream diff applied cleanly.
Indeed - leaving large blocks of #if'd out upstream code can easily lead to a false sense that everything was successful in a merge. It's actually better that the merge creates a conflict: the merger then needs to understand the change and determine if it actually applies to FreeBSD or not, rather than just accepting the patch. Both approaches have arguments for and against, but ultimately I think the decision rests with the one doing the work. _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "[email protected]"
