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...

[John Baldwin]

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