From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: Switching from old git tree Date: Fri, 14 Nov 2014 14:53:22 +0100 Organization: Organization?!? Message-ID: <87egt5q46l.fsf@fencepost.gnu.org> References: <87ioiiotwx.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415973238 11380 80.91.229.3 (14 Nov 2014 13:53:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 13:53:58 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 14 14:53:51 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XpHJv-0007j0-Hk for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 14:53:51 +0100 Original-Received: from localhost ([::1]:36613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpHJv-0000xO-8Z for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 08:53:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpHJo-0000wm-B3 for emacs-devel@gnu.org; Fri, 14 Nov 2014 08:53:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpHJj-0000Sr-1g for emacs-devel@gnu.org; Fri, 14 Nov 2014 08:53:44 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:35938) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpHJi-0000Sj-R0 for emacs-devel@gnu.org; Fri, 14 Nov 2014 08:53:38 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XpHJe-0007ZQ-3F for emacs-devel@gnu.org; Fri, 14 Nov 2014 14:53:34 +0100 Original-Received: from x2f520ac.dyn.telefonica.de ([2.245.32.172]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 14 Nov 2014 14:53:34 +0100 Original-Received: from dak by x2f520ac.dyn.telefonica.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 14 Nov 2014 14:53:34 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 42 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: x2f520ac.dyn.telefonica.de X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:eGxdpPqApzpeIygSrIMmjV+ECNM= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177075 Archived-At: Sven Axelsson writes: > On 14 November 2014 13:20, David Kastrup wrote: >> peder@news.klingenberg.no (Peder O. Klingenberg) writes: >> >>> I have been using the old git-mirror for a while. In there, I have a >>> branch with some local modifications. >>> >>> I understand that I need to check out a fresh tree now after the >>> conversion? What is the smoothest way of integrating my local branch in >>> this new tree? I'm a very basic git user, and the only way I can think >>> of is to extract the patches from my old branch and applying them by >>> hand in the new tree. >> >> Using git format-patch and git am, rather than git diff and git apply. >> >>> Is there something else I should be doing instead? >> >> I don't think there is much of an option to do something else. > > I suppose you could add your old repo as a local remote to the new one, and > cherry-pick your commits, i.e.: > > git remote add old /local/path/to/old > # Fetch the data to your new repo > git fetch old > # Find the commits to pick somehow > git log old/master > # Copy to new repo > git cherry-pick Well, I was trying to avoid the "double your repository size or no money back" effect. While the file and tree blobs in two differently converted Emacs repositories are presumably pretty much the same, the entire commit history is disjoint. Once it takes root in your repository, it will take a long long time before it gets washed out again _after_ removing all branches/references to it. Going through patches minimizes the data the new repository gets to see from the old one. -- David Kastrup