From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: bzr repository ready? Date: Thu, 19 Nov 2009 01:49:21 +0100 Message-ID: References: <87eiyy3lag.fsf@notengoamigos.org> <87bpu1451m.fsf@red-bean.com> <874ozs34c6.fsf@notengoamigos.org> <87k58nyih3.fsf@red-bean.com> <87d4eerm8w.fsf@red-bean.com> <87k4yy7qba.fsf@yahoo.com> <87vdiiof1d.fsf@canonical.com> <87d44ceg5s.fsf@stupidchicken.com> <87bpjwe46n.fsf@red-bean.com> <87zl6vskq0.fsf@red-bean.com> <874op07kb0.fsf@red-bean.com> <87639fr3w7.fsf@red-bean.com> <87vdhfpil2.fsf@red-bean.com> <87einvxy9c.fsf@red-bean.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1258591786 4017 80.91.229.12 (19 Nov 2009 00:49:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 19 Nov 2009 00:49:46 +0000 (UTC) Cc: Jason Earl , Ian Clatworthy , emacs-devel@gnu.org To: Karl Fogel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 19 01:49:39 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 1NAvDO-0002Ts-1B for ged-emacs-devel@m.gmane.org; Thu, 19 Nov 2009 01:49:38 +0100 Original-Received: from localhost ([127.0.0.1]:47577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAvDN-0003Tx-9V for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2009 19:49:37 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAvDH-0003S4-Ml for emacs-devel@gnu.org; Wed, 18 Nov 2009 19:49:31 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAvDD-0003Qc-3s for emacs-devel@gnu.org; Wed, 18 Nov 2009 19:49:31 -0500 Original-Received: from [199.232.76.173] (port=59232 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAvDC-0003QZ-UC for emacs-devel@gnu.org; Wed, 18 Nov 2009 19:49:26 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.10]:39385) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAvDB-0005wN-MU for emacs-devel@gnu.org; Wed, 18 Nov 2009 19:49:26 -0500 Original-Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id 2EF791C0032A; Thu, 19 Nov 2009 01:49:23 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 0DF9490249; Thu, 19 Nov 2009 01:49:23 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.3.149]) by localhost (dynscan1.mnet-online.de [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id dlESlJRKIWt8; Thu, 19 Nov 2009 01:49:22 +0100 (CET) Original-Received: from igel.home (DSL01.83.171.155.20.ip-pool.NEFkom.net [83.171.155.20]) by mail.mnet-online.de (Postfix) with ESMTP; Thu, 19 Nov 2009 01:49:22 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id E2831CA28C; Thu, 19 Nov 2009 01:49:21 +0100 (CET) X-Yow: ..Everything is....FLIPPING AROUND!! In-Reply-To: <87einvxy9c.fsf@red-bean.com> (Karl Fogel's message of "Wed, 18 Nov 2009 17:29:35 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:117221 Archived-At: Karl Fogel writes: > $ diff -u cvs-all-tags bzr-all-tags | grep "^[+-]" > --- cvs-all-tags 2009-11-18 14:54:59.000000000 -0500 > +++ bzr-all-tags 2009-11-18 15:13:28.000000000 -0500 > -DAVELOVE > +EMACS_20_1 > +EMACS_20_3 > -FLYSPELL > -ILYA > -mh-e-8_1 > -mh-e-8_2 > -mh-e-doc-8_1 > -mh-e-doc-8_2 > -raeburn-tag-3-for-export > -small-dump-base > -URL The raeburn-tag-3-for-export tag only exist in three files, two of which are not *,v files. The third file does no longer contain the revision that this tag is referencing. So for all practical purpose, this tag does not exist. The other missing tags (except for those that appear as branches, see below) are due to bugs/limitations in cvsps and inconsistent tagging (parsecvs can handle them much better). I will have to manually add them to the git and bzr repo. > The two tags that are present in Bazaar but not CVS are particularly > mystifying to me. While 'EMACS_20_1' and 'EMACS_20_3' appear in > 'bzr tags' in trunk, they do not appear in 'cvs log' output from the > top of the CVS tree. I do not know where bzr got those tags from. > Since the CVS tag (e.g.) EMACS_20_2 exists, it is reasonable to > conclude that bzr is crazy and is getting _1 and _3 from somewhere. > But where? Those are tags that I added manually. I don't think that creates any problems, other tags have been retroactively added in the past. > * Check that all branches are present. [?] > > diff -u cvs-all-branches.out bzr-branches | grep "^[-+]" > --- cvs-all-branches.out 2009-11-18 16:52:50.000000000 -0500 > +++ bzr-branches 2009-11-18 16:52:45.000000000 -0500 > +Boehm-versions > +DAVELOVE > +FLYSPELL > +ILYA > +URL > -cedet-branch > -emacs-unicode In my git repository, I created merge commits that merges the heads of cedet-branch and emacs-unicode branch into the trunk and the emacs-unicode-2 branch, resp. Apparently bzr-fast-import does not create a separate branch in such an event, but all the revisions are present and referenced by the merge commit. That is, if you removed the cedet-branch and emacs-unicode heads from the git repo no commit would become unreferenced. > "The Boehm-versions branch was a short-lived branch containing only > a gc directory. It appears to be a mistaken checkin, the commit > that deleted the files has the log message 'Not committed to > branch, sorry.'." Actually the Boehm-versions branch is a real branch in CVS, and I have no idea why it doesn't appear in your list. The files that are referenced by this branch also appeared for a single revision on the trunk, and were subsequently moved to the Boehm-GC branch. > He also said: "The Ilya_4_35 branch appears to be the result of > another git->bzr conversion bug. It is an ordinary tag in git." I > wonder if the same applies to ILYA now? I could find out, but I'm > just going to send this mail now because I've been poking around in > CVS all day and I want to share some results! Those extra branches are vendor branches. They have very special revision numbers (uneven number of digits, usually 1.1.1) that your script miscategorized as non-branches. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."