Date: Sat, 7 Dec 2013 18:23:30 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r259073 - in stable/10: . contrib/ipfilter contrib/top share/man/man4 share/mk sys/amd64/include sys/contrib/dev/acpica sys/contrib/ipfilter/netinet sys/dev/fdt sys/x86/include Message-ID: <201312071823.rB7INUsS070594@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: peter Date: Sat Dec 7 18:23:29 2013 New Revision: 259073 URL: http://svnweb.freebsd.org/changeset/base/259073 Log: Hoist all the mergeinfo up to the root in preparation for enforcing merges to the root only. All MFC's were rerecorded to the root. Going forward, if an MFC includes mergeinfo, it will need to be made to the root and committed from the root. Merges with --ignore-ancestry or diff | patch can go anywhere. The mergeinfo in HEAD is in a bad state from years of neglect and manual tampering and this was branched into 10.x. This confuses the coalescing code and prevents it from doing its job. Approved by: re (gjb, implicit) Modified: Directory Properties: stable/10/ (props changed) stable/10/MAINTAINERS (props changed) stable/10/Makefile.inc1 (props changed) stable/10/ObsoleteFiles.inc (props changed) stable/10/UPDATING (props changed) stable/10/bin/df/ (props changed) stable/10/bin/freebsd-version/ (props changed) stable/10/cddl/ (props changed) stable/10/cddl/contrib/opensolaris/ (props changed) stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) stable/10/cddl/contrib/opensolaris/cmd/zfs/ (props changed) stable/10/cddl/contrib/opensolaris/lib/libzfs/ (props changed) stable/10/contrib/apr/ (props changed) stable/10/contrib/apr-util/ (props changed) stable/10/contrib/atf/ (props changed) stable/10/contrib/binutils/ (props changed) stable/10/contrib/bmake/ (props changed) stable/10/contrib/byacc/ (props changed) stable/10/contrib/bzip2/ (props changed) stable/10/contrib/com_err/ (props changed) stable/10/contrib/compiler-rt/ (props changed) stable/10/contrib/dialog/ (props changed) stable/10/contrib/dtc/ (props changed) stable/10/contrib/ee/ (props changed) stable/10/contrib/expat/ (props changed) stable/10/contrib/file/ (props changed) stable/10/contrib/gcc/ (props changed) stable/10/contrib/gdb/ (props changed) stable/10/contrib/gdtoa/ (props changed) stable/10/contrib/groff/ (props changed) stable/10/contrib/ipfilter/ (props changed) stable/10/contrib/ipfilter/ml_ipl.c (props changed) stable/10/contrib/ipfilter/mlfk_ipl.c (props changed) stable/10/contrib/ipfilter/mlh_rule.c (props changed) stable/10/contrib/ipfilter/mli_ipl.c (props changed) stable/10/contrib/ipfilter/mln_ipl.c (props changed) stable/10/contrib/ipfilter/mls_ipl.c (props changed) stable/10/contrib/ldns/ (props changed) stable/10/contrib/less/ (props changed) stable/10/contrib/libarchive/ (props changed) stable/10/contrib/libarchive/cpio/ (props changed) stable/10/contrib/libarchive/libarchive/ (props changed) stable/10/contrib/libarchive/libarchive_fe/ (props changed) stable/10/contrib/libarchive/tar/ (props changed) stable/10/contrib/libc++/ (props changed) stable/10/contrib/libc-vis/ (props changed) stable/10/contrib/libcxxrt/ (props changed) stable/10/contrib/libexecinfo/ (props changed) stable/10/contrib/libpcap/ (props changed) stable/10/contrib/libstdc++/ (props changed) stable/10/contrib/llvm/ (props changed) stable/10/contrib/llvm/tools/clang/ (props changed) stable/10/contrib/mtree/ (props changed) stable/10/contrib/ncurses/ (props changed) stable/10/contrib/netcat/ (props changed) stable/10/contrib/ntp/ (props changed) stable/10/contrib/nvi/ (props changed) stable/10/contrib/one-true-awk/ (props changed) stable/10/contrib/openbsm/ (props changed) stable/10/contrib/openpam/ (props changed) stable/10/contrib/openresolv/ (props changed) stable/10/contrib/pf/ (props changed) stable/10/contrib/sendmail/ (props changed) stable/10/contrib/serf/ (props changed) stable/10/contrib/smbfs/ (props changed) stable/10/contrib/subversion/ (props changed) stable/10/contrib/tcpdump/ (props changed) stable/10/contrib/tcsh/ (props changed) stable/10/contrib/tnftp/ (props changed) stable/10/contrib/top/ (props changed) stable/10/contrib/top/install-sh (props changed) stable/10/contrib/tzcode/stdtime/ (props changed) stable/10/contrib/tzcode/zic/ (props changed) stable/10/contrib/tzdata/ (props changed) stable/10/contrib/unbound/ (props changed) stable/10/contrib/wpa/ (props changed) stable/10/contrib/xz/ (props changed) stable/10/crypto/heimdal/ (props changed) stable/10/crypto/openssh/ (props changed) stable/10/crypto/openssl/ (props changed) stable/10/etc/ (props changed) stable/10/etc/rc.d/ (props changed) stable/10/gnu/lib/ (props changed) stable/10/gnu/usr.bin/binutils/ (props changed) stable/10/gnu/usr.bin/cc/cc_tools/ (props changed) stable/10/gnu/usr.bin/gdb/ (props changed) stable/10/include/ (props changed) stable/10/lib/ (props changed) stable/10/lib/libc/ (props changed) stable/10/lib/libc/stdtime/ (props changed) stable/10/lib/libc_nonshared/ (props changed) stable/10/lib/libfetch/ (props changed) stable/10/lib/libiconv_modules/ (props changed) stable/10/lib/libsmb/ (props changed) stable/10/lib/libthr/ (props changed) stable/10/lib/libutil/ (props changed) stable/10/lib/libvmmapi/ (props changed) stable/10/lib/libyaml/ (props changed) stable/10/lib/libz/ (props changed) stable/10/release/ (props changed) stable/10/release/doc/ (props changed) stable/10/sbin/ (props changed) stable/10/sbin/camcontrol/ (props changed) stable/10/sbin/dumpon/ (props changed) stable/10/sbin/hastd/ (props changed) stable/10/sbin/ifconfig/ (props changed) stable/10/sbin/ipfw/ (props changed) stable/10/sbin/nvmecontrol/ (props changed) stable/10/share/ (props changed) stable/10/share/examples/bhyve/ (props changed) stable/10/share/i18n/csmapper/JIS/ (props changed) stable/10/share/i18n/esdb/EUC/ (props changed) stable/10/share/man/ (props changed) stable/10/share/man/man4/ (props changed) stable/10/share/man/man4/bhyve.4 (props changed) stable/10/share/man/man5/ (props changed) stable/10/share/man/man7/ (props changed) stable/10/share/man/man8/ (props changed) stable/10/share/misc/ (props changed) stable/10/share/mk/ (props changed) stable/10/share/mk/bsd.arch.inc.mk (props changed) stable/10/share/syscons/ (props changed) stable/10/share/zoneinfo/ (props changed) stable/10/sys/ (props changed) stable/10/sys/amd64/include/vmm.h (props changed) stable/10/sys/amd64/include/vmm_dev.h (props changed) stable/10/sys/amd64/include/vmm_instruction_emul.h (props changed) stable/10/sys/amd64/include/xen/ (props changed) stable/10/sys/amd64/vmm/ (props changed) stable/10/sys/boot/ (props changed) stable/10/sys/boot/i386/efi/ (props changed) stable/10/sys/boot/ia64/efi/ (props changed) stable/10/sys/boot/ia64/ski/ (props changed) stable/10/sys/boot/powerpc/boot1.chrp/ (props changed) stable/10/sys/boot/powerpc/ofw/ (props changed) stable/10/sys/cddl/contrib/opensolaris/ (props changed) stable/10/sys/conf/ (props changed) stable/10/sys/contrib/dev/acpica/ (props changed) stable/10/sys/contrib/dev/acpica/changes.txt (props changed) stable/10/sys/contrib/dev/acpica/common/ (props changed) stable/10/sys/contrib/dev/acpica/compiler/ (props changed) stable/10/sys/contrib/dev/acpica/components/debugger/ (props changed) stable/10/sys/contrib/dev/acpica/components/disassembler/ (props changed) stable/10/sys/contrib/dev/acpica/components/dispatcher/ (props changed) stable/10/sys/contrib/dev/acpica/components/events/ (props changed) stable/10/sys/contrib/dev/acpica/components/executer/ (props changed) stable/10/sys/contrib/dev/acpica/components/hardware/ (props changed) stable/10/sys/contrib/dev/acpica/components/namespace/ (props changed) stable/10/sys/contrib/dev/acpica/components/parser/ (props changed) stable/10/sys/contrib/dev/acpica/components/resources/ (props changed) stable/10/sys/contrib/dev/acpica/components/tables/ (props changed) stable/10/sys/contrib/dev/acpica/components/utilities/ (props changed) stable/10/sys/contrib/dev/acpica/include/ (props changed) stable/10/sys/contrib/dev/acpica/os_specific/ (props changed) stable/10/sys/contrib/ipfilter/ (props changed) stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (props changed) stable/10/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c (props changed) stable/10/sys/contrib/libfdt/ (props changed) stable/10/sys/contrib/octeon-sdk/ (props changed) stable/10/sys/contrib/x86emu/ (props changed) stable/10/sys/dev/bvm/ (props changed) stable/10/sys/dev/fdt/fdt_ic_if.m (props changed) stable/10/sys/dev/hyperv/ (props changed) stable/10/sys/modules/hyperv/ (props changed) stable/10/sys/modules/vmm/ (props changed) stable/10/sys/x86/include/acpica_machdep.h (props changed) stable/10/tools/ (props changed) stable/10/tools/build/ (props changed) stable/10/tools/build/options/ (props changed) stable/10/tools/tools/atsectl/ (props changed) stable/10/usr.bin/calendar/ (props changed) stable/10/usr.bin/csup/ (props changed) stable/10/usr.bin/iscsictl/ (props changed) stable/10/usr.bin/procstat/ (props changed) stable/10/usr.sbin/ (props changed) stable/10/usr.sbin/bhyve/ (props changed) stable/10/usr.sbin/bhyvectl/ (props changed) stable/10/usr.sbin/bhyveload/ (props changed) stable/10/usr.sbin/bsdconfig/ (props changed) stable/10/usr.sbin/bsdinstall/ (props changed) stable/10/usr.sbin/ctladm/ (props changed) stable/10/usr.sbin/ctld/ (props changed) stable/10/usr.sbin/freebsd-update/ (props changed) stable/10/usr.sbin/jail/ (props changed) stable/10/usr.sbin/mergemaster/ (props changed) stable/10/usr.sbin/mount_smbfs/ (props changed) stable/10/usr.sbin/ndiscvt/ (props changed) stable/10/usr.sbin/pkg/ (props changed) stable/10/usr.sbin/rtadvctl/ (props changed) stable/10/usr.sbin/rtadvd/ (props changed) stable/10/usr.sbin/rtsold/ (props changed) stable/10/usr.sbin/zic/ (props changed)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312071823.rB7INUsS070594>