From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: Fixing repository conversion errors. Date: Thu, 13 Nov 2014 13:27:34 +0100 (CET) Message-ID: <20141113.132734.2054141284236869539.hanche@math.ntnu.no> References: <20141113031255.GA21938@thyrsus.com> <20141113114308.GA30912@thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: Text/Plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1415881680 7155 80.91.229.3 (13 Nov 2014 12:28:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 12:28:00 +0000 (UTC) Cc: emacs-devel@gnu.org, bob@proulx.com, dmoncayo@gmail.com To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 13:27:53 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 1XotVB-0001pZ-3p for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 13:27:53 +0100 Original-Received: from localhost ([::1]:59398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XotVA-0005B1-K5 for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 07:27:52 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XotV2-0005AU-Li for emacs-devel@gnu.org; Thu, 13 Nov 2014 07:27:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XotV1-000699-Rx for emacs-devel@gnu.org; Thu, 13 Nov 2014 07:27:44 -0500 Original-Received: from hylle05.itea.ntnu.no ([2001:700:300:3::225]:45955) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XotV1-00066h-KS for emacs-devel@gnu.org; Thu, 13 Nov 2014 07:27:43 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id 6CC7990064C; Thu, 13 Nov 2014 13:27:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from localhost (unknown [IPv6:2001:700:300:1470:e1d5:1cfe:53f1:3db]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id 540FD9029F9; Thu, 13 Nov 2014 13:27:35 +0100 (CET) In-Reply-To: <20141113114308.GA30912@thyrsus.com> X-URL: http://www.math.ntnu.no/~hanche/ X-Mailer: Mew version 6.6 on Emacs 24.4.51 / Mule 6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:700:300:3::225 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:176894 Archived-At: ["Eric S. Raymond" (2014-11-13 11:43:08 UTC)] > (b) Probably about four hours of repo downtime. It won't be ten this ti= me > because I don't have to do another full conversion, just edit a pulled = copy,=20 > repack it, and upload it. Is that really necessary? I would have thought you could create a new branch with the fixed commit messages. It should sprout off the master branch not too far in the past. Push the new branch to the server. Then just rename branches on the server, so the new branch will be master. Then all the developers will have to rewind the master branch (and origin/master) in their own clones to the latest good commit, and do a pull. No need for a full reclone, I think. If the problem affects more branches than just master, this might not be much of a simplification, however. =E2=80=93 Harald