From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 16:27:19 2014 Return-Path: Delivered-To: svn-src-projects@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 179D4792; Mon, 1 Dec 2014 16:27:19 +0000 (UTC) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id E75DF5EA; Mon, 1 Dec 2014 16:27:18 +0000 (UTC) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.14.9/8.14.9) with ESMTP id sB1G3YAW084937 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 1 Dec 2014 08:03:34 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.9/8.14.9/Submit) id sB1G3Y1o084936; Mon, 1 Dec 2014 08:03:34 -0800 (PST) (envelope-from sgk) Date: Mon, 1 Dec 2014 08:03:34 -0800 From: Steve Kargl To: John Baldwin Subject: Re: svn commit: r275122 - in projects/clang350-import: contrib/ipfilter contrib/llvm/lib/Target/Sparc/AsmParser contrib/llvm/lib/Target/Sparc/Disassembler contrib/llvm/lib/Target/Sparc/InstPrinter cont... Message-ID: <20141201160334.GA84795@troutmask.apl.washington.edu> References: <201411261436.sAQEa5v1084618@svn.freebsd.org> <5196246.smYqWMH2Lk@ralph.baldwin.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5196246.smYqWMH2Lk@ralph.baldwin.cx> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, Dimitry Andric X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Dec 2014 16:27:19 -0000 On Mon, Dec 01, 2014 at 09:05:32AM -0500, John Baldwin wrote: > On Wednesday, November 26, 2014 02:36:05 PM Dimitry Andric wrote: > > Author: dim > > Date: Wed Nov 26 14:36:04 2014 > > New Revision: 275122 > > URL: https://svnweb.freebsd.org/changeset/base/275122 > > > > Log: > > After some horrible wrestling with Subversion's worthless merge > > implementation, merge ^/head r275078 through r275117. > > > > Note that all the extraneous mergeinfo is there because Subversion > > created it. I'll hopefully be able to remove it again when merging back > > to head. > > To be honest, for merging back to HEAD, I'd probably just do it by hand. > We've been burned in the past by svn thinking it should copy modified > files from the projects branch into HEAD instead of doing a merge thus > losing history in HEAD. Probably what I would recommend is trying to do > a merge, but reading the diff very carefully to ensure no modified files > are added wholesale and then explicitly remove any mergeinfo before > comitting (assuming you will only do a single merge at the end in which > case the mergeinfo would be useless anyway) > Isn't this backwards? The initial commit (and testing) should be done in HEAD, and once it is proven to work, the commit is then merged into the branches. -- Steve