From owner-svn-src-all@freebsd.org Sat Oct 8 00:13:09 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 B2B36C05F84; Sat, 8 Oct 2016 00:13:09 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 834A3AB7; Sat, 8 Oct 2016 00:13:09 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from julian-mbp3.pixel8networks.com (50-196-156-133-static.hfc.comcastbusiness.net [50.196.156.133]) (authenticated bits=0) by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id u980D7pu062021 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Fri, 7 Oct 2016 17:13:08 -0700 (PDT) (envelope-from julian@freebsd.org) Subject: Re: svn commit: r306811 - in head: etc/mtree include sys/sys sys/sys/disk To: Marcel Moolenaar , John Baldwin References: <201610071542.u97FgLgU092008@repo.freebsd.org> <1910643.6VW4zuRaGg@ralph.baldwin.cx> <9665440.L9f0uMEDrK@ralph.baldwin.cx> Cc: svn-src-all@freebsd.org, svn-src-head@freebsd.org, src-committers@freebsd.org, Marcel Moolenaar From: Julian Elischer Message-ID: Date: Fri, 7 Oct 2016 17:13:01 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit 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: Sat, 08 Oct 2016 00:13:09 -0000 On 7/10/2016 4:29 PM, Marcel Moolenaar wrote: > On October 7, 2016 at 4:18:31 PM, Julian Elischer > (julian@freebsd.org ) wrote: >> On 7/10/2016 4:12 PM, Marcel Moolenaar wrote: >>> On October 7, 2016 at 3:18:10 PM, John Baldwin (jhb@freebsd.org >>> ) wrote: >>>> On Friday, October 07, 2016 01:16:59 PM Marcel Moolenaar wrote: >>>> > 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? >>>> >>>> I think a copy would have been best. There is content in the >>>> sys/foo.h files >>>> still that has valid history (not all the lines were moved). Even >>>> if you had >>>> moved it all, I think a copy would still be best. I would only >>>> use a move >>>> if you are completely removing the original file. I'm not sure if >>>> there's a >>>> non-unfun way to recover from this. You might be able to copy the >>>> files from >>>> the previous revision, reapply your changes and then commit that. >>> >>> Ok. I’ll work on recovering the history of the original files. >>> >>> Maybe the repo masters can undo/delete the commit easily and I’ll >>> just recommit. Avoids polluting the history… >>> >>> >> I'll keep an eye out for my svn -> p4 mirror importer exploding in >> that area in the near future. >> this sort of thing makes it very ill, especially files going away >> and coming back. > > I just asked svnadm@ for advice. I’m sure they can suggest a way > that doesn’t blow things up downstream consumers. I’m fine with the > manual labor if that’s preferred... > > I run a svn-> P4 imoprter that is importign at 1:1.. so change 300000 in SVN is 300000 in p4. If we end up making extra or missing revisions, I'll lose that 1:1 feature ..e.g. if 350000 in svn maps to 350001 or 349999 in p4 that's a lot less useful to me..