From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ken Raeburn Newsgroups: gmane.emacs.devel Subject: Re: Bazaar migration status? Date: Wed, 22 Jul 2009 19:46:49 -0400 Message-ID: <4F76137C-0F9C-4181-8C02-F47C0180A9E3@raeburn.org> References: <87skgvtatv.fsf@stupidchicken.com> <87vdlpi2t9.fsf@canonical.com> <87skgrj8z6.fsf@catnip.gol.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v935.3) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1248306448 10422 80.91.229.12 (22 Jul 2009 23:47:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 22 Jul 2009 23:47:28 +0000 (UTC) Cc: Emacs Development To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 23 01:47:21 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MTlWp-0005FX-9Y for ged-emacs-devel@m.gmane.org; Thu, 23 Jul 2009 01:47:19 +0200 Original-Received: from localhost ([127.0.0.1]:51061 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MTlWo-0004xX-Es for ged-emacs-devel@m.gmane.org; Wed, 22 Jul 2009 19:47:18 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MTlWj-0004xR-6b for emacs-devel@gnu.org; Wed, 22 Jul 2009 19:47:13 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MTlWd-0004xF-PV for emacs-devel@gnu.org; Wed, 22 Jul 2009 19:47:11 -0400 Original-Received: from [199.232.76.173] (port=60899 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MTlWd-0004xC-Jz for emacs-devel@gnu.org; Wed, 22 Jul 2009 19:47:07 -0400 Original-Received: from splat.raeburn.org ([69.25.196.39]:51663 helo=raeburn.org) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MTlWP-0006k5-2B for emacs-devel@gnu.org; Wed, 22 Jul 2009 19:47:07 -0400 Original-Received: from [10.0.0.172] (squish.raeburn.org [10.0.0.172]) by raeburn.org (8.14.3/8.14.1) with ESMTP id n6MNknUj004072; Wed, 22 Jul 2009 19:46:51 -0400 (EDT) In-Reply-To: X-Mailer: Apple Mail (2.935.3) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:113028 Archived-At: On Jul 22, 2009, at 17:33, Andreas Schwab wrote: >> And if we're publishing (or planning to publish) git repositories >> with >> development work based on the Emacs one? Rebasing is strongly >> discouraged for public repositories. > > I was only talking about a one-off rebasing, when migrating from the > current git mirror based on the cvs repo to a future git mirror > based on > the bzr repo. The advice I've seen isn't "don't do it too often", it's "don't do it". The recovery process seems to be a manual one for people downstream from those rebasing. But, I think I can find a way to turn it into a "merge" from one history to another for most of my more interesting branches. It might not be *too* horrible for downstream. (For that matter, I was "only" talking about a one-off project to make the new bzr-based git history at savannah look as though it was continuing on from the old cvs-based git history.) Ken