From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Git transition checklist Date: Wed, 08 Jan 2014 20:02:35 +0200 Message-ID: <838uuqfj2c.fsf@gnu.org> References: <20140108135200.8ECF9380834@snark.thyrsus.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1389204174 32551 80.91.229.3 (8 Jan 2014 18:02:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Jan 2014 18:02:54 +0000 (UTC) Cc: esr@thyrsus.com, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 08 19:03:00 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 1W0xSz-0001rd-Ax for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 19:02:57 +0100 Original-Received: from localhost ([::1]:48207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0xSy-0003Ta-VH for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 13:02:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0xSr-0003SO-0Y for emacs-devel@gnu.org; Wed, 08 Jan 2014 13:02:54 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0xSl-00025T-Q8 for emacs-devel@gnu.org; Wed, 08 Jan 2014 13:02:48 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:50485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0xSl-00025O-IB for emacs-devel@gnu.org; Wed, 08 Jan 2014 13:02:43 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0MZ300200GOYAU00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Wed, 08 Jan 2014 20:02:41 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MZ30028DGSH7A50@a-mtaout23.012.net.il>; Wed, 08 Jan 2014 20:02:41 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 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:167765 Archived-At: > 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.