From owner-svn-src-all@FreeBSD.ORG Mon May 11 13:53:36 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DFB8968B; Mon, 11 May 2015 13:53:36 +0000 (UTC) Received: from mail-ig0-x232.google.com (mail-ig0-x232.google.com [IPv6:2607:f8b0:4001:c05::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A9A1515AE; Mon, 11 May 2015 13:53:36 +0000 (UTC) Received: by igbpi8 with SMTP id pi8so69968292igb.1; Mon, 11 May 2015 06:53:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=JrHJZ7Ai0gvbObaWWaEBiVAooNpUPrLTlFdRj77fY34=; b=tkmctaYGox3g5+1TD0zqJYjgENWwUHvgrvcaqIJ4m/AcgLb91XdBMtPGzxjchf5aTa tGP89eRsfnawM7ye4rS24Fru4PEJgPqsxznpPtnQly8sVA7XObwhvkh7/vdeew6HCR+T B/fuQrL7K9RGo5K2OlWsb2Kqwj9Hq1rniCYzkSjyhUOA0gGW0/7T8ARVnyhK9JRZQBzL KGRdEuWfSPbucB779jGGpCIoBLP9plf4KkCgrY77gwdn1AwP/T4htfrMcZsX+9C/yZM1 YbBssnb13aAev5KzKSw7NvGLTY8y2RUXekrysKWKP2HNYRmTelQp9uZjjUTxT12Z85e4 DsKg== X-Received: by 10.50.143.33 with SMTP id sb1mr12967259igb.33.1431352416139; Mon, 11 May 2015 06:53:36 -0700 (PDT) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.48.3 with HTTP; Mon, 11 May 2015 06:53:15 -0700 (PDT) In-Reply-To: <20150511024754.GA65659@raichu> References: <201505102227.t4AMRn1g007294@svn.freebsd.org> <55500C0D.7090802@freebsd.org> <20150511024754.GA65659@raichu> From: Ed Maste Date: Mon, 11 May 2015 09:53:15 -0400 X-Google-Sender-Auth: xEH5kH-ATO3-clHN8QZDwt-vzvw Message-ID: Subject: Re: svn commit: r282744 - in head/sys/cddl/dev/dtrace: amd64 i386 To: Mark Johnston Cc: Julian Elischer , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 13:53:37 -0000 On 10 May 2015 at 22:47, Mark Johnston 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.