From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 14:48:40 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 6DE44C13; Mon, 1 Dec 2014 14:48:40 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 467E2885; Mon, 1 Dec 2014 14:48:40 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net [173.70.85.31]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 4E521B999; Mon, 1 Dec 2014 09:48:39 -0500 (EST) From: John Baldwin To: Dimitry Andric 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... Date: Mon, 01 Dec 2014 09:05:32 -0500 Message-ID: <5196246.smYqWMH2Lk@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <201411261436.sAQEa5v1084618@svn.freebsd.org> References: <201411261436.sAQEa5v1084618@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 01 Dec 2014 09:48:39 -0500 (EST) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org 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 14:48:40 -0000 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) -- John Baldwin