Date: Wed, 8 Feb 2017 13:59:12 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r312926 - in head: bin/ed contrib/dma share/mk sys/amd64/amd64 sys/amd64/cloudabi64 sys/cam/ctl sys/cddl/dev/fbt/x86 sys/compat/cloudabi sys/compat/cloudabi64 sys/compat/linuxkpi/common... Message-ID: <20170208125911.sxr2gtayke3qpohr@ivaldir.etoilebsd.net> In-Reply-To: <6F201758-8984-49A9-9F47-5E9C4F5700E4@gmail.com> References: <201701281630.v0SGUEfW063907@repo.freebsd.org> <6F201758-8984-49A9-9F47-5E9C4F5700E4@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--bhsrxqnlhlo7s7kz Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 08, 2017 at 12:52:20AM -0800, Ngie Cooper (yaneurabeya) wrote: >=20 > > On Jan 28, 2017, at 08:30, Baptiste Daroussin <bapt@FreeBSD.org> wrote: > >=20 > > Author: bapt > > Date: Sat Jan 28 16:30:14 2017 > > New Revision: 312926 > > URL: https://svnweb.freebsd.org/changeset/base/312926 > >=20 > > Log: > > Revert r312923 a better approach will be taken later > >=20 > > Modified: > > head/bin/ed/Makefile > > head/contrib/dma/mail.c > > head/share/mk/bsd.doc.mk > > head/sys/amd64/amd64/db_trace.c > > head/sys/amd64/cloudabi64/cloudabi64_sysvec.c > > head/sys/cam/ctl/ctl_ioctl.h > > head/sys/cddl/dev/fbt/x86/fbt_isa.c > > head/sys/compat/cloudabi/cloudabi_fd.c > > head/sys/compat/cloudabi64/cloudabi64_poll.c > > head/sys/compat/linuxkpi/common/include/linux/slab.h > > head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c > > head/sys/contrib/dev/acpica/include/acpixf.h > > head/sys/ddb/ddb.h > > head/sys/dev/drm2/drm_agpsupport.c > > head/sys/dev/drm2/drm_bufs.c > > head/sys/dev/drm2/drm_dma.c > > head/sys/dev/drm2/drm_drv.c > > head/sys/dev/drm2/drm_os_freebsd.c > > head/sys/dev/drm2/drm_os_freebsd.h > > head/sys/dev/drm2/drm_stub.c > > head/sys/fs/nfsserver/nfs_nfsdstate.c > > head/sys/kern/kern_descrip.c > > head/sys/kern/kern_shutdown.c > > head/sys/modules/drm2/drm2/Makefile > > head/tools/build/Makefile > > head/tools/tools/locale/etc/unicode.conf > > head/usr.bin/getconf/confstr.gperf > > head/usr.bin/getconf/getconf.c > > head/usr.bin/getconf/limits.gperf > > head/usr.bin/getconf/pathconf.gperf > > head/usr.bin/getconf/progenv.gperf > > head/usr.bin/getconf/sysconf.gperf > > head/usr.sbin/nscd/nscd.c > > head/usr.sbin/nscd/nscdcli.c >=20 > I noticed that this revision and the next one are a point of issue when = running =E2=80=9Csvn merge --reintegrate ". Was "svn merge -c -=E2=80=9C us= ed? Yes the crap was I did svn merge -c -312923 then svn ci which took the reve= rt and all the temporary crap I had I reverted entirely that one later and commit "manually" the files that were supposed to be reverted initially by copying the files from before r312923 So sorry it was a total mess. Bapt --bhsrxqnlhlo7s7kz Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAlibFhwACgkQY4mL3PG3 Plq2CRAAnLcs2m+voJKZNPxzeFVpUhrDwmNJGrQQ957SDIiQNSwr7gR3LB+J7GxZ hpwE7tXwvc3aCOMdrqCnO3EhOGpfoD4erwRLObbp87NnOSGXAgJaMfMu591/em68 0YcaeK/PiPH9y5QZEOKkXIpVVlBQev5/0tm3R6IE3UDkbfaWiAX2pTP0nwoBMUNP hQqEvBwTsEtm7PQlmEATjR0xAxgk37kbBthrxLxxsFYPlzocpNhVuSnKfleH3xkY I8KYt82Nl4yp+ONtKtYGVsoa+mVCa5GN5g46tfqcnXD1xMwqfzJY3KFgFu/zo8wd EVNwqG4t/q9j0KcRMNEZH0EIyjHANHSPE1MyD7Dlow+VFQDt1ly7pinksWjB8DNa k/3HawyrlXD1WkkWa5ayTSEbuEP0aIqct6SHG4qRIFlZM5MJJzCOZRCzSJOfsEzx UPaX8DHIqMLh1tOQyD7DKULwCMZosNXv03X1zn/jBmc+z+Sae88/mtvwB1nkAHNR Rh8QwZ4NTmYPbvLgbITk9EOiNxzQQzB3aOVynrlIQmjWaG6qjF/+szu/o+k+8ogV nWR5xsLlQfBzUPEdsn4PtHUMyCTGhRnbtfkIF9a6VJV0lDgmzg8umIw502HVZ9aE WyAXNlj1+WjCnIaUy0oXNjbqlaaxG+4G/+xfabiW/QUpTLxYHmI= =31x3 -----END PGP SIGNATURE----- --bhsrxqnlhlo7s7kz--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170208125911.sxr2gtayke3qpohr>