Date: Fri, 7 Oct 2016 13:16:59 -0700 From: Marcel Moolenaar <marcel@xcllnt.net> To: Marcel Moolenaar <marcel@freebsd.org>, John Baldwin <jhb@freebsd.org> Cc: svn-src-all@freebsd.org, svn-src-head@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r306811 - in head: etc/mtree include sys/sys sys/sys/disk Message-ID: <etPan.57f802bb.59e4fadb.7f0b@xcllnt.net> In-Reply-To: <1910643.6VW4zuRaGg@ralph.baldwin.cx> References: <201610071542.u97FgLgU092008@repo.freebsd.org> <1910643.6VW4zuRaGg@ralph.baldwin.cx>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On October 7, 2016 at 11:02:44 AM, John Baldwin (jhb@freebsd.org) wrote: On Friday, October 07, 2016 03:42:21 PM Marcel Moolenaar wrote: *snip* > Author: marcel > Date: Fri Oct 7 15:42:20 2016 > New Revision: 306811 > URL: https://svnweb.freebsd.org/changeset/base/306811 > > Added: > head/sys/sys/disk/ > head/sys/sys/disk/apm.h > - copied, changed from r306810, head/sys/sys/apm.h > head/sys/sys/disk/bsd.h > - copied, changed from r306810, head/sys/sys/disklabel.h > head/sys/sys/disk/gpt.h > - copied, changed from r306810, head/sys/sys/gpt.h > head/sys/sys/disk/mbr.h > - copied, changed from r306810, head/sys/sys/diskmbr.h > head/sys/sys/disk/pc98.h > - copied, changed from r306810, head/sys/sys/diskpc98.h > head/sys/sys/disk/vtoc.h > - copied, changed from r306810, head/sys/sys/vtoc.h > Replaced: > head/sys/sys/apm.h (contents, props changed) > head/sys/sys/disklabel.h (contents, props changed) > head/sys/sys/diskmbr.h (contents, props changed) > head/sys/sys/diskpc98.h (contents, props changed) > head/sys/sys/gpt.h (contents, props changed) > head/sys/sys/vtoc.h (contents, props changed) Somehow this destroyed the history on these files. They showed up as deleted and then added instead of modified. If you 'svn log' on them now you only get this commit and none of the previous history. I've no idea if there's a way to recover this? Had you originally done an 'svn mv' in your checkout and then copied the files back over or some such? 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? [-- Attachment #2 --] -----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-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?etPan.57f802bb.59e4fadb.7f0b>