Date: Fri, 7 Oct 2016 16:29:34 -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.57f82fdf.23ab0955.1066a@xcllnt.net> In-Reply-To: <f1ccb989-58bb-ccec-f6df-d2d4d18974a2@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>
next in thread | previous in thread | raw e-mail | index | archive | help
--47F75208-0DED-4F06-8C3A-3A138ECAFF0D Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline 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... --47F75208-0DED-4F06-8C3A-3A138ECAFF0D 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+C/fAAoJEIda8t8f0tjjvw4QAL1tKPArbq63GrgmH6QFJMtN TEx/qteAhTDOB9gDl4qeUQm8wx0mMuPTbzpYBKVF6c1HSb84V0kveKuo+QsuYqN1 bzkLjWPr7FSwA6gGva/eA9oP1WCgoW7iSyMSTCwfBFBG0gOaXOacEG719P/KQ1TG kZecI7skMOpTCYWFhUJM+5BJV86LYllbjDI91HxxmBSi+P7wJ/WWAmVFxExMq8U3 CHs2QQ3i0uGcGJSjJaBJfcJ1txNJ2hSHs3Gj6/rbBwsV+AYRcsa22j7C7iMKcZPG oTZewBwA6fW1hCBOqM8YHVgzi2B59rWfsBrOd2GlwF9/SyL55Q8HHdQe4Kja6dez 0zu2hPZaI4Qwo+DPRintary8tNf8k31KTfIW2skpgb1D05XNR3UzNsCpj87dX7sr nJd6kOio8Z7q16glzqQoQKEUgyQLZotb0TBxu7r5iF0EdJOqZbN09NXeXJDYkF6X RhFkrVRITarXBoPC9609BD+wXk4bvCw6yvbMOL/p9q5Pahn+h7Kkvl5rJfZBGpvi sGzGyDHTlSVgRiYykPU4JNQqoDmqk6zGkn6F4PlqvODOEjvFOE5AncAEg8pi+ODo GoCfv9rXLxW95UdiI3nOLA55vGTzpChrYQUSgUpXsSO9fv8cngQM9cvsePxRKcc2 xafjgx5gYOu8TQbKtnJU -----END PGP SIGNATURE----- --47F75208-0DED-4F06-8C3A-3A138ECAFF0D--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?etPan.57f82fdf.23ab0955.1066a>