From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Reitter Newsgroups: gmane.emacs.devel Subject: Re: Progress on the git repo cleanup Date: Thu, 6 Mar 2014 14:53:39 -0500 Message-ID: <7A33D431-2709-4086-87B4-420C6B39148C@gmail.com> References: <20140306182108.8ABE5380687@snark.thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1394135631 24312 80.91.229.3 (6 Mar 2014 19:53:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 6 Mar 2014 19:53:51 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Eric S. Raymond" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 06 20:53:59 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 1WLeMh-0006vJ-Mk for ged-emacs-devel@m.gmane.org; Thu, 06 Mar 2014 20:53:59 +0100 Original-Received: from localhost ([::1]:59912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLeMg-000187-Tw for ged-emacs-devel@m.gmane.org; Thu, 06 Mar 2014 14:53:58 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLeMY-00015n-K4 for emacs-devel@gnu.org; Thu, 06 Mar 2014 14:53:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLeMT-0001K9-T4 for emacs-devel@gnu.org; Thu, 06 Mar 2014 14:53:50 -0500 Original-Received: from mail-qg0-x230.google.com ([2607:f8b0:400d:c04::230]:37709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLeMT-0001Ip-Mq for emacs-devel@gnu.org; Thu, 06 Mar 2014 14:53:45 -0500 Original-Received: by mail-qg0-f48.google.com with SMTP id j107so8551338qga.7 for ; Thu, 06 Mar 2014 11:53:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=h6hIRYb3wwC4YZIvLS0ruXrK+6h7PZduw1okrkftMO4=; b=IHCQnMcDrarUXF47qp68zVKnn6kd85rQRrVkYbTHOXapACz28KTl463fEPkXTdBJA0 Z5goDRf1CXay0bi3c0c3H/umDr9pM/xJf9GAme5UswqYDpEl9Ph45FzpJ1kjmfJOTfyw r9cvkvlxHCr1dq4LjZFz7Yg8nVpgY1s6kglfgzY7T1Db3n+/Zo40yrKdjyqt7nQZ3FfL ZTSynQ1jZWaiwhGXlEXcQObjTXMwP+BcItMGt8rRruwxIFw0YuGPnh82FZKjjODC68c4 9kOifNxWbkHvxZZOMZ4QKEtqBt8MVd3JOInoPz+in8eq3wA2lH668D2+pCD0HLg2KBxH ACdQ== X-Received: by 10.140.48.82 with SMTP id n76mr15707271qga.82.1394135624936; Thu, 06 Mar 2014 11:53:44 -0800 (PST) Original-Received: from client-75-102-97-120.mobility-up.psu.edu (client-75-102-97-120.mobility-up.psu.edu. [75.102.97.120]) by mx.google.com with ESMTPSA id h46sm9325784qgd.10.2014.03.06.11.53.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Mar 2014 11:53:42 -0800 (PST) In-Reply-To: <20140306182108.8ABE5380687@snark.thyrsus.com> X-Mailer: Apple Mail (2.1874) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::230 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:170187 Archived-At: Eric, What is the procedure for those of us that keep a separate branch = around, which has multiple (50+) merges from the mainline or Emacs 23, = and many private changes? Thanks, David On Mar 6, 2014, at 1:21 PM, Eric S. Raymond wrote: > Some time ago I posted a list of desiderata for a cleaned-up gir > repository. I now have a lift script that achieves all of these. > Here is the current list >=20 > # 1. Map some remnant CVS user names to DVCS IDs > # > # 2. Turn fossil Bazaar and CVS references into action stamps. =20 > # > # 3. Identify and convert .cvsignore and .bzrignore files. > # > # 4. Rename and deletion fixups for RCS attic files > # > # 5. Squash commit cliques that were not properly merged during the = Bazaar lift. > # > # 6. Incorporate fixes-bug properties from Bazaar. > # > # 7. Massage bug URLs in change comments into a canonical form. >=20 > One minor issue remains; the *only* 4-digit Bazaar reference (to 3176) > does not lift for some reason. I can fix that. >=20 > The conversion machinery is at=20 >=20 > git@gitorious.org:emacs-transition/emacs-transition.git >=20 > so others can audit my procedure. Everything is documented. In the > near future I will push a copy of the cleaned-up repo to gitorious. >=20 > What this means is that we can now pull the switch anytime Stefan = says. >=20 > The only practical problem is that a full run of the lift script takes > around ten hours. You can reduce the number of those I have to do by > not embedding any more Bazaar commit numbers in ChangeLogs or commit > comments. >=20 > I've been sent a list of alternative forms of committer names that > could be normalized, but I recall there was some resistance to doing > this. Stefan, do you have a policy preference? > --=20 > Eric S. = Raymond >=20 > The politician attempts to remedy the evil by increasing the very = thing > that caused the evil in the first place: legal plunder. > -- Frederick Bastiat >=20