From owner-svn-src-all@freebsd.org Mon Apr 18 18:53:53 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5BC93B12F4A; Mon, 18 Apr 2016 18:53:53 +0000 (UTC) (envelope-from jhb@freebsd.org) 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 18A111BA6; Mon, 18 Apr 2016 18:53:53 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 163C4B989; Mon, 18 Apr 2016 14:53:52 -0400 (EDT) From: John Baldwin To: Glen Barber Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r298107 - in head: . bin/cat bin/cat/tests bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/date/tests bin/dd bin/dd/tests bin/df bin/domainname bin/echo bin/ed bin/expr bin/e... Date: Mon, 18 Apr 2016 10:36:41 -0700 Message-ID: <1815296.pIt0iZy7kC@ralph.baldwin.cx> User-Agent: KMail/4.14.3 (FreeBSD/10.2-STABLE; KDE/4.14.3; amd64; ; ) In-Reply-To: <201604160745.u3G7jV8j080717@repo.freebsd.org> References: <201604160745.u3G7jV8j080717@repo.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, 18 Apr 2016 14:53:52 -0400 (EDT) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 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, 18 Apr 2016 18:53:53 -0000 On Saturday, April 16, 2016 07:45:31 AM Glen Barber wrote: > Author: gjb > Date: Sat Apr 16 07:45:30 2016 > New Revision: 298107 > URL: https://svnweb.freebsd.org/changeset/base/298107 > > Log: > Merge the projects/release-pkg branch to head. > > This allows packaging the base system with pkg(8), including > but not limited to providing the ability to provide upstream > binary update possibilities for non-tier-1 architectures. > > This merge is a requirement of the 11.0-RELEASE, and as such, > thank you to everyone that has tested the project branch. > > Documentation in build(7) etc. is still somewhat sparse, but > updates to those parts will follow. > > Sponsored by: The FreeBSD Foundation > > Replaced: > head/sys/boot/forth/Makefile > - copied unchanged from r298104, projects/release-pkg/sys/boot/forth/Makefile You destroyed the history for this file in a way that is pretty much impossible to recover. Compare svn log of stable/10/sys/boot/forth/Makefile with head/sys/boot/forth/Makefile. This is why svn merge IMO should _never_ be used from a projects or user branch into HEAD. It is just too broken. I think we should always use 'svn diff > foo.patch' and 'svn patch foo.patch' in a clean checkout instead. (Note that previous merges such as the initial bhyve import have also destroyed history on files, so this is something that happens fairly often on merges from project branches. I really do think we should forbid them and document that as such.) -- John Baldwin