From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.devel Subject: Re: Renaming files with git not all that bad? Date: Thu, 09 Dec 2021 07:02:09 +0100 Message-ID: <878rwuia7g.fsf@gnu.org> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12603"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.7.5; emacs 29.0.50 Cc: emacs-devel@gnu.org, Stefan Kangas , Mathias Dahl To: Yuri Khan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Dec 09 07:08:12 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mvCbC-0002zl-LJ for ged-emacs-devel@m.gmane-mx.org; Thu, 09 Dec 2021 07:08:10 +0100 Original-Received: from localhost ([::1]:42810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvCbA-0000nD-Uo for ged-emacs-devel@m.gmane-mx.org; Thu, 09 Dec 2021 01:08:08 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:37628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvCZO-0007o1-Qq for emacs-devel@gnu.org; Thu, 09 Dec 2021 01:06:18 -0500 Original-Received: from [2001:470:142:3::e] (port=59592 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvCZM-0006Z3-WE; Thu, 09 Dec 2021 01:06:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-reply-to:Date:Subject:To:From: References; bh=ufK5KpAOwJBXoQFRlMHsRDaTDUqH/hUXO+1HI/H7+pI=; b=N7wgw4WN34Yp8E CN3OtCmmaOFim5VS/Fu7JlP25mXLm49OZh3hbgdzNxG2z0r8QkWdnc/COPBbUe3wQgpcOQdHMAaBk wPk+71F0ywZS04ybK3qa12ffKEzGzDrB2qJgY4LlnxOwD2kZ3Xe4LmvUnWMi3cl0T7trTTLtiJPls lVDsSjfHbGDMmkhJV4ar3fRX3DdeuOAMZc5ZODPAaD9GOZ+lN0JxJ+by9d1JnWKkTW2bn7PkwdXle L6oRiPfoma5vmvb62WNKWT5fiO8YoR7AfTlGdGm4fPURnPSzHrJQc+f0MhubYgOe614hki7F26Qd6 c5QsiDbtQyU009qSTOMw==; Original-Received: from auth1-smtp.messagingengine.com ([66.111.4.227]:40587) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvCZM-0003YH-5c; Thu, 09 Dec 2021 01:06:16 -0500 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailauth.nyi.internal (Postfix) with ESMTP id 5543A27C0054; Thu, 9 Dec 2021 01:06:15 -0500 (EST) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 09 Dec 2021 01:06:15 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrjeelgdelvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpehffgfhvffuffgjkfggtgesthdtredttdertdenucfhrhhomhepvfgrshhsihhl ohcujfhorhhnuceothhsughhsehgnhhurdhorhhgqeenucggtffrrghtthgvrhhnpeevve eikeetkeeviefgfeffiedvteeguddvffeuueduveegtddthedvhfeuveffhfenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhorhhnodhmvg hsmhhtphgruhhthhhpvghrshhonhgrlhhithihqdekieejfeekjeekgedqieefhedvleek qdhtshguhheppehgnhhurdhorhhgsehfrghsthhmrghilhdrfhhm X-ME-Proxy: Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Dec 2021 01:06:14 -0500 (EST) In-reply-to: X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:281439 Archived-At: Yuri Khan writes: > The gist of it is: > > * From the original point, start multiple branches, one for each part. > * On each branch: > * Rename the original file to the file name of the target part, and > commit just this renaming. > * Then, remove the lines that do not belong to this part, and also commit. > * Finally, do an octopus merge on all the branches together. > > This way, each part traces its ancestry to the original file through a > rename-only commit. Couldn't the same effect be achieved in a simpler manner by copying the original file N times in one commit and then stripping the copies and original down to what they should eventually become? (AFAIK, git has no problem detecting literal copies.) Bye, Tassilo