Date: Fri, 7 Oct 2016 17:24:56 -0700 From: Marcel Moolenaar <marcel@xcllnt.net> To: Julian Elischer <julian@freebsd.org>, John Baldwin <jhb@freebsd.org> Cc: svn-src-all@freebsd.org, svn-src-head@freebsd.org, src-committers@freebsd.org, Marcel Moolenaar <marcel@freebsd.org> Subject: Re: svn commit: r306811 - in head: etc/mtree include sys/sys sys/sys/disk Message-ID: <etPan.57f83cd8.cc5698e.1066a@xcllnt.net> In-Reply-To: <acd1c614-7a92-f14e-77f1-d218beb0530d@freebsd.org> References: <201610071542.u97FgLgU092008@repo.freebsd.org> <1910643.6VW4zuRaGg@ralph.baldwin.cx> <etPan.57f802bb.59e4fadb.7f0b@xcllnt.net> <9665440.L9f0uMEDrK@ralph.baldwin.cx> <etPan.57f82bc8.1c4e7435.1066a@xcllnt.net> <f1ccb989-58bb-ccec-f6df-d2d4d18974a2@freebsd.org> <etPan.57f82fdf.23ab0955.1066a@xcllnt.net> <acd1c614-7a92-f14e-77f1-d218beb0530d@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--B635C3D0-26CE-492C-98D2-2865C476E695 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On October 7, 2016 at 5:13:10 PM, Julian Elischer (julian=40freebsd.org) = wrote: On 7/10/2016 4:29 PM, Marcel Moolenaar wrote: On October 7, 2016 at 4:18:31 PM, Julian Elischer (julian=40freebsd.org) = wrote: On 7/10/2016 4:12 PM, Marcel Moolenaar wrote: On October 7, 2016 at 3:18:10 PM, John Baldwin (jhb=40freebsd.org) wrote:= On =46riday, October 07, 2016 01:16:59 PM Marcel Moolenaar wrote:=C2=A0 > On October 7, 2016 at 11:02:44 AM, John Baldwin (jhb=40freebsd.org) wro= te:=C2=A0 > On =46riday, October 07, 2016 03:42:21 PM Marcel Moolenaar wrote:=C2=A0= > *snip*=C2=A0 >=C2=A0 > > Author: marcel=C2=A0 > > Date: =46ri Oct 7 15:42:20 2016=C2=A0 > > New Revision: 306811=C2=A0 > > URL:=C2=A0https://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 >=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/dis= k/X.h. New files were put where the old files used to be.=C2=A0 >=C2=A0 > Should I have done a svn copy=3F=C2=A0 I think a copy would have been best. There is content in the sys/foo.h fi= les=C2=A0 still that has valid history (not all the lines were moved). Even if you = had=C2=A0 moved it all, I think a copy would still be best. I would only use a move= =C2=A0 if you are completely removing the original file. I'm not sure if there's= a=C2=A0 non-unfun way to recover from this. You might be able to copy the files f= rom=C2=A0 the previous revision, reapply your changes and then commit that.=C2=A0 Ok. I=E2=80=99ll work on recovering the history of the original files. Maybe the repo masters can undo/delete the commit easily and I=E2=80=99ll= just recommit. Avoids polluting the history=E2=80=A6 I'll keep an eye out for my svn -> p4 mirror importer exploding in that a= rea in the near future. this sort of thing makes it very ill, especially files going away and com= ing back. I just asked svnadm=40 for advice. I=E2=80=99m sure they can suggest a wa= y that doesn=E2=80=99t blow things up downstream consumers. I=E2=80=99m f= ine with the manual labor if that=E2=80=99s preferred... I run a svn-> P4 imoprter that is importign at 1:1..=C2=A0 so change 3000= 00 in SVN is 300000 in p4. If we end up making extra or missing revisions, I'll lose that 1:1 featur= e ..e.g.=C2=A0 if 350000 in svn maps to 350001=C2=A0 or 349999 in p4 that= 's=C2=A0 a lot less useful to me.. I=E2=80=99ll keep that in mind. If svnadm=40 has no strong opinions, I=E2= =80=99ll manually fix it up using commits. Thanks for the info, --B635C3D0-26CE-492C-98D2-2865C476E695 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+DzZAAoJEIda8t8f0tjjnW0P/ReZeDP8uwzE5vis00ek/qu+ p/4/WFKQDLbyU7puUT1QBn51rz3yrPfcmd7RA1PfnDa7WNZ1sqZkoABuqGIFm/kV XXqfOEpFbF31DD/BDEL0HgjxRQjnDxDmDOsIcqXpdmcURSl2jlNwb2mI9JUr5tHc j16LCB7jWLH8EoK6rQuxv3qNkshOqmJbpxdROWp1yXkyMpXqE1HWvardOrSmvRUC Gtj90aN6SiThfcKtbqaxgA0VFatEsQL7N7xIyO+n/xZ/r7zT/+2S/Azm6b6p8w8v 7dmlB6eCJwvdfw4oYjXUfPzB+PHSdaUU27mnWFouvZo+ggngSJKpqypScA9vDza1 1JYJao8BJG6Mq4u8Q8Y3xCggbex2owu0Zn0B06J24PVz6Ns+ds30DzvOLdZMVFA+ JWkuNicfdZ4jrXjfCbrBxPvpepPq+SlTa3cFMosbGasWosHmuexdGdZWUzc4upnR FJpsS5annx8MLTiYQWWKTsXXJ31T2C4zHFtvzGIBHKS7lHwY5pRg4UBV9HnPfdBT 8ejle9s9T8xAJ10VoRRSDSI8R36wGaKEyhizmPDwD7rFzrXfwutq2plM+9ZWVAff kmFgUYeaAvQ312krZV0ijOdjU5TvVeSM9vPrCP0dupiddnuqK1WqF1kV6fKOhrqb C0/8iSWjQ/VbSEg4AKSc -----END PGP SIGNATURE----- --B635C3D0-26CE-492C-98D2-2865C476E695--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?etPan.57f83cd8.cc5698e.1066a>