From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Git transition checklist Date: Wed, 08 Jan 2014 19:17:03 +0100 Message-ID: <8761puz6cg.fsf@engster.org> References: <20140108135200.8ECF9380834@snark.thyrsus.com> <838uuqfj2c.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389205048 11560 80.91.229.3 (8 Jan 2014 18:17:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Jan 2014 18:17:28 +0000 (UTC) Cc: esr@thyrsus.com, Stefan Monnier , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 08 19:17:35 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 1W0xh8-00085x-71 for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 19:17:34 +0100 Original-Received: from localhost ([::1]:48276 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0xh7-000267-Pq for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 13:17:33 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0xh0-000209-Cn for emacs-devel@gnu.org; Wed, 08 Jan 2014 13:17:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0xgv-0006Tf-Ko for emacs-devel@gnu.org; Wed, 08 Jan 2014 13:17:26 -0500 Original-Received: from randomsample.de ([5.45.97.173]:34914) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0xgv-0006Sx-B5; Wed, 08 Jan 2014 13:17:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=E1v/1Mal/FdJAWiVPV7N6EtwfGpUAlhBvBlzmMKgcAo=; b=GxN1xKyGAUDisL3eJ9v5omOyboIfhtziISot5Q2Sinl+nVw5bROQrNWk6nBstRMube+TyB6qphptn8Ka9zuMt/9aWWWTwRDE9hAzs5QL/kyW2vpyEg3iQekLVD5JBIGD; Original-Received: from dslc-082-083-063-247.pools.arcor-ip.net ([82.83.63.247] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1W0xgl-0002Ms-7c; Wed, 08 Jan 2014 19:17:11 +0100 In-Reply-To: <838uuqfj2c.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 08 Jan 2014 20:02:35 +0200") User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3 (gnu/linux) Mail-Followup-To: Eli Zaretskii , Stefan Monnier , esr@thyrsus.com, emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:167769 Archived-At: Eli Zaretskii writes: >> From: Stefan Monnier >> Date: Wed, 08 Jan 2014 09:59:53 -0500 >> Cc: emacs-devel@gnu.org > >> >> > That's easy. Make a patch sequence from your bzr branch using sendto >> > - the format is compatible with GNU patch. git checkout the branch >> > name at the equivalent point in the git repo. Use GNU patch to apply. >> > Fill in change comments as required. >> >> Sounds like a lot of manual work and it doesn't seem to preserve history >> (e.g. merges that might have taken place). For a branch with a couple >> commits that's probably OK, but with my 5 year-old branch it's >> a non-starter, unless I misunderstand something. > > Indeed. I want to preserve the history of that branch, because it is > work in progress that will land one day on the trunk. I don't want to > see dozens of commits appear as a single jumbo commit after the > migration. I'm quite sure I mentioned that in my original request. If I understood Andreas correctly, all branches currently in the Savannah repository are converted. So if you push this branch before the switch, it should land in git as well? -David