From owner-svn-src-all@freebsd.org Fri Oct 7 20:17:12 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 AE8D1BED266; Fri, 7 Oct 2016 20:17:12 +0000 (UTC) (envelope-from marcel@xcllnt.net) Received: from mail.xcllnt.net (mail.xcllnt.net [50.0.150.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8026DEBC; Fri, 7 Oct 2016 20:17:12 +0000 (UTC) (envelope-from marcel@xcllnt.net) Received: from Marcels-MacBook-Pro.local.mail (cerberus.brkt.com [208.185.168.138]) (authenticated bits=0) by mail.xcllnt.net (8.15.2/8.15.2) with ESMTPSA id u97KH5w1098486 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NO); Fri, 7 Oct 2016 13:17:06 -0700 (PDT) (envelope-from marcel@xcllnt.net) Date: Fri, 7 Oct 2016 13:16:59 -0700 From: Marcel Moolenaar To: Marcel Moolenaar , John Baldwin Cc: svn-src-all@freebsd.org, svn-src-head@freebsd.org, src-committers@freebsd.org Message-ID: In-Reply-To: <1910643.6VW4zuRaGg@ralph.baldwin.cx> References: <201610071542.u97FgLgU092008@repo.freebsd.org> <1910643.6VW4zuRaGg@ralph.baldwin.cx> Subject: Re: svn commit: r306811 - in head: etc/mtree include sys/sys sys/sys/disk X-Mailer: Airmail (382) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="404AA341-7C1B-43FD-83D8-60C6BEACF337"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.xcllnt.net [50.0.150.214]); Fri, 07 Oct 2016 13:17:06 -0700 (PDT) X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Fri, 07 Oct 2016 20:17:12 -0000 --404AA341-7C1B-43FD-83D8-60C6BEACF337 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On October 7, 2016 at 11:02:44 AM, John Baldwin (jhb=40freebsd.org) wrote= : On =46riday, October 07, 2016 03:42:21 PM Marcel Moolenaar wrote:=C2=A0 *snip* > Author: marcel=C2=A0 > Date: =46ri Oct 7 15:42:20 2016=C2=A0 > New Revision: 306811=C2=A0 > URL: https://svnweb.freebsd.org/changeset/base/306811=C2=A0 >=C2=A0 > Added:=C2=A0 > head/sys/sys/disk/=C2=A0 > head/sys/sys/disk/apm.h=C2=A0 > - copied, changed from r306810, head/sys/sys/apm.h=C2=A0 > head/sys/sys/disk/bsd.h=C2=A0 > - copied, changed from r306810, head/sys/sys/disklabel.h=C2=A0 > head/sys/sys/disk/gpt.h=C2=A0 > - copied, changed from r306810, head/sys/sys/gpt.h=C2=A0 > head/sys/sys/disk/mbr.h=C2=A0 > - copied, changed from r306810, head/sys/sys/diskmbr.h=C2=A0 > head/sys/sys/disk/pc98.h=C2=A0 > - copied, changed from r306810, head/sys/sys/diskpc98.h=C2=A0 > head/sys/sys/disk/vtoc.h=C2=A0 > - copied, changed from r306810, head/sys/sys/vtoc.h=C2=A0 > Replaced:=C2=A0 > head/sys/sys/apm.h (contents, props changed)=C2=A0 > head/sys/sys/disklabel.h (contents, props changed)=C2=A0 > head/sys/sys/diskmbr.h (contents, props changed)=C2=A0 > head/sys/sys/diskpc98.h (contents, props changed)=C2=A0 > head/sys/sys/gpt.h (contents, props changed)=C2=A0 > head/sys/sys/vtoc.h (contents, props changed)=C2=A0 Somehow this destroyed the history on these files. They showed up as=C2=A0= deleted and then added instead of modified. If you 'svn log' on them=C2=A0= now you only get this commit and none of the previous history. I've=C2=A0= no idea if there's a way to recover this=3F Had you originally done an=C2= =A0 'svn mv' in your checkout and then copied the files back over or some=C2=A0= such=3F=C2=A0 I did a move from sys/X.h to sys/disk/X.h. The history moved to sys/disk/= X.h. New files were put where the old files used to be. Should I have done a svn copy=3F --404AA341-7C1B-43FD-83D8-60C6BEACF337 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using AMPGpg -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJX+AK8AAoJEIda8t8f0tjjHKIQAMgyrVJC95HxY31i3tU9A/Mk Jd/AY2cu14wIvvvDGV293OoMXNDo08sTiasfIf+tiwpqnsM7aAqTKRe3y4DogixU 4bKFu0NFmDDUSM3jVEGs4Jq7VME9zl7VRtKFucGvXpOA8YBdueMmoDitShU1xMdE hzBWjs5HNSjOdMCYTuKn92in5BLjteO42zL4cABxWLF0UPbWFouj98JevKcpu34w 7O6qaPxq//l/V4CBhnBzBxTqHyUm+wyPKu9m29a79iffYver1gI18pXu0hGL6/oY nvjkn2jmUIeHIwa3pE+hFPT/axkW7iF/9NUMPqKM3zm703I1U9qq+G8f8fEmm1yU 3nA5SwBwpWpn5QXFBbpn2EvPmRjiZF70b7cbNN+u3RptVPcu2yiBI5EvDXVS5ng+ lqAG7+jZXftFJLvy7gqQ0nI6Os/asCVNYN+i4+STk1PS3m6Zk4ssKt1OSK0Jt6cJ BMapCF9CKvTyjMQTtdWkyJB055vL1ZM5A1Ytgu6lb9khrZca7ai4osG+IgN0QkXs 1kyi8uklv1sCiCC045bx/CeRo/SfA9JfFmxPIcmfinf9q2GiMozGIaWrlrAb9jx2 7N+FacRFk+12laWGvXdLQjGt6Q0L2W63alSoXkqqRMcPodXXIxInJS5ni7FLxHzo 0mu2K+wysYOFnR8scwWv -----END PGP SIGNATURE----- --404AA341-7C1B-43FD-83D8-60C6BEACF337--