Re: bzr repository ready?

[Karl Fogel]

Okay, I've spent some time yesterday and today checking over the latest
Bzr conversion, which I obtained thusly:

  $ scp -r address@hidden:/srv/bzr/emacs emacs-bzr-repository

Below are the results.  Mostly it's looking pretty good.  Search for two
items where it says "[?]" to see areas where I'm concerned.  Assuming we
have good answers for those concerns, I'd say it's time to Just Do It.
I mean, we always have the old CVS data if worse comes to worst, right?

* Make sure it builds and runs from the trunk branch.  [PASS]

  Built it with './configure && make bootstrap', ran it.  'Nuff said :-).

* Spot-check a change.  [PASS]

  This change in CVS...

      2008-06-12 11:29  cyd
        * src/xfns.c (1.712):
        (Fx_select_font): Rename from x-font-dialog.

  ...matches this change in Bazaar:

    ------------------------------------------------------------
    revno: 88518
    committer: Chong Yidong <address@hidden>
    timestamp: Thu 2008-06-12 15:29:18 +0000
    message:
      (Fx_select_font): Rename from x-font-dialog.
    modified:
      src/xfns.c
    ------------------------------------------------------------

* Spot-check a change.  [PASS]

  This change in CVS...

    2008-06-12 01:35  miles

        * src/.gdbinit, src/font.c, src/dispnew.c, src/font.h,
        src/ftfont.c, src/dispextern.h, src/w32term.c, src/xterm.c,
        src/xdisp.c, src/ChangeLog, src/lisp.h, src/makefile.w32-in,
        src/menu.c, src/w32gui.h, src/xfns.c, src/dired.c, src/emacs.c,
        src/w32font.c, src/w32uniscribe.c, src/Makefile.in, src/fontset.c,
        src/gtkutil.c, src/gtkutil.h, src/macterm.c, src/keyboard.h,
        src/ChangeLog.4, src/buffer.c, src/w32menu.c, src/ChangeLog.10,
        src/ChangeLog.6, src/ChangeLog.7, src/window.c, src/ChangeLog.8,
        src/minibuf.c, src/xmenu.c, lisp/finder.el, src/ChangeLog.9,
        lisp/dired.el, lisp/files.el, lisp/wid-edit.el, lisp/ediff-merg.el,
        lisp/t-mouse.el, lisp/Makefile.in, lisp/apropos.el, lisp/vc-cvs.el,
        lisp/ChangeLog.10, lisp/mouse.el, lisp/ChangeLog.12,
        lisp/xt-mouse.el, lisp/cus-start.el, lisp/ffap.el,
        lisp/ChangeLog.1, lisp/ChangeLog.5, lisp/ChangeLog.7,
        lisp/ChangeLog.8, lisp/ChangeLog.9, lisp/uniquify.el,
        lisp/menu-bar.el, lisp/strokes.el, lisp/ChangeLog,
        lisp/minibuffer.el, lisp/vc-rcs.el, lisp/faces.el, lisp/startup.el,
        lisp/comint.el, lisp/subr.el, lisp/button.el, lisp/window.el,
        lisp/vc-dispatcher.el, lisp/international/mule-cmds.el,
        lisp/international/mule-diag.el, lisp/erc/ChangeLog,
        lisp/erc/erc-autoaway.el, lisp/erc/erc-ibuffer.el, lisp/erc/erc.el,
        lisp/international/fontset.el, lisp/erc/ChangeLog.04,
        lisp/erc/erc-menu.el, lisp/erc/erc-stamp.el, lisp/gnus/mml.el,
        lisp/gnus/ChangeLog.1, lisp/gnus/gnus-group.el,
        lisp/gnus/gnus-msg.el, lisp/gnus/ChangeLog.2,
        lisp/gnus/gnus-logic.el, lisp/gnus/message.el,
        lisp/gnus/nnheader.el, lisp/gnus/mm-encode.el, lisp/gnus/nnir.el,
        lisp/gnus/sieve-manage.el, lisp/gnus/mml1991.el,
        lisp/gnus/mml2015.el, lisp/gnus/nntp.el, lisp/gnus/spam-report.el,
        lisp/gnus/mm-view.el, lisp/gnus/nnmail.el, lisp/gnus/spam.el,
        lisp/gnus/gnus-picon.el, lisp/gnus/gnus-util.el,
        lisp/gnus/mail-source.el, lisp/gnus/nnrss.el,
        lisp/gnus/gnus-agent.el, lisp/gnus/gnus-ems.el,
        lisp/gnus/mm-decode.el, lisp/gnus/gnus-sum.el,
        lisp/gnus/gnus-cache.el, lisp/gnus/nnfolder.el,
        lisp/gnus/nnmairix.el, lisp/gnus/gnus.el, lisp/gnus/nnimap.el,
        lisp/gnus/nnvirtual.el, lisp/gnus/ChangeLog, lisp/gnus/nnml.el,
        lisp/gnus/auth-source.el, lisp/term/linux.el, lisp/term/w32-win.el,
        lisp/net/newsticker-reader.el, lisp/net/newsticker-ticker.el,
        lisp/net/newsticker-treeview.el, lisp/net/telnet.el,
        lisp/net/tls.el, lisp/net/tramp.el, lisp/net/newsticker-backend.el,
        lisp/net/newsticker.el, lisp/eshell/em-dirs.el,
        lisp/eshell/esh-util.el, lisp/net/netrc.el,
        lisp/net/newsticker-plainview.el, lisp/eshell/em-glob.el,
        lisp/eshell/em-ls.el, lisp/eshell/em-unix.el,
        lisp/eshell/esh-cmd.el, lisp/eshell/esh-opt.el,
        lisp/eshell/esh-test.el, lisp/calendar/cal-bahai.el,
        lisp/calendar/diary-lib.el, lisp/eshell/esh-io.el,
        lisp/progmodes/compile.el, lisp/progmodes/fortran.el,
        lisp/emacs-lisp/bytecomp.el, lisp/progmodes/etags.el,
        lisp/emacs-lisp/autoload.el, lisp/emacs-lisp/lisp-mnt.el,
        lisp/emacs-lisp/map-ynp.el, lisp/emacs-lisp/trace.el,
        lisp/mh-e/ChangeLog.1, lisp/mh-e/mh-acros.el,
        lisp/mh-e/mh-letter.el, lisp/mh-e/ChangeLog, lisp/mh-e/mh-alias.el,
        Makefile.in, lisp/mh-e/mh-comp.el, ChangeLog, INSTALL.CVS,
        doc/lispref/ChangeLog, leim/quail/hangul.el, lisp/mail/sendmail.el,
        lisp/mail/smtpmail.el, admin/FOR-RELEASE, lisp/url/ChangeLog,
        doc/emacs/ChangeLog, lisp/url/url-auth.el, etc/ChangeLog, etc/NEWS,
        lisp/language/hanja-util.el, lib-src/ChangeLog, doc/misc/ChangeLog,
        lisp/emulation/edt-mapper.el, lisp/textmodes/page-ext.el,
        leim/ChangeLog, nt/ChangeLog
        
(lexbind.[34,12,56,6,9,66,61,84,141,204,78,30,2,10,69,30,62,10,4,58,34,57,17,105,24,8,74,31,8,9,9,93,11,55,48,20,9,69,118,48,16,16,49,25,34,22,63,15,26,40,30,10,14,15,14,13,18,51,21,225,7,26,65,80,61,99,21,37,5,53,21,34,12,11,29,18,8,9,14,39,10,39,27,20,11,66,22,13,3,16,16,21,22,18,28,28,24,13,38,25,21,31,18,40,62,20,20,5,40,32,13,139,16,6,8,29,2,2,2,17,23,76,2,15,16,13,15,2,17,18,19,21,14,15,17,46,16,94,28,70,29,28,18,13,15,9,18,14,68,22,45,34,108,13,18,13,33,33,112,70,21,19,132,177,4,81,21,14,13,59,61]):

        Merge from emacs--devo--0

        Revision: address@hidden/emacs--lexbind--0--patch-89

  ...matches this change in Bazaar on the 'lexbind' branch:

    revno: 46036 [merge]
    committer: Miles Bader <address@hidden>
    timestamp: Thu 2008-06-12 05:37:00 +0000
    message:
      Merge from emacs--devo--0
      
      Revision: address@hidden/emacs--lexbind--0--patch-89
            [...]

* Spot-check a change.  [PASS]

  This change in CVS...

     1989-10-31 10:56  jla

        * lisp/: case-table.el (1.1), disp-table.el (1.1),
        play/dissociate.el (1.1), ehelp.el (1.1), mail/emacsbug.el (1.1),
        float-sup.el (1.1), play/gomoku.el (1.1), =gosmacs.el (1.1),
        emacs-lisp/helper.el (1.1), hexl.el (1.1), progmodes/icon.el (1.1),
        ledit.el (1.1), macros.el (1.1), mail/mail-utils.el (1.1),
        makesum.el (1.1), emulation/mlconvert.el (1.1), novice.el (1.1),
        textmodes/nroff-mode.el (1.1), textmodes/page.el (1.1),
        textmodes/paragraphs.el (1.1), rect.el (1.1), textmodes/refbib.el
        (1.1), mail/rmailedit.el (1.1), mail/rmailkwd.el (1.1),
        textmodes/spell.el (1.1), play/spook.el (1.1), tabify.el (1.1):

        Initial revision

  ...plus this change in CVS (listed separately by cvs2cl, but that's
     just an artifact of cvs2cl's commit grouping, not of CVS itself)...

      1989-10-31 10:59  jla

        * lisp/textmodes/text-mode.el (1.1), lisp/textmodes/underline.el
        (1.1), lisp/userlock.el (1.1), lisp/vms-patch.el (1.1),
        lisp/window.el (1.1), lib-src/emacstool.c (1.1):

        Initial revision

   ...plus the implicit addition of the "lisp/emacs-lisp/" directory...

   ...all together match this change in Bazaar:

      ------------------------------------------------------------
      revno: 37
      committer: Joseph Arceneaux <address@hidden>
      timestamp: Tue 1989-10-31 16:00:07 +0000
      message:
        Initial revision
      added:
        lib-src/emacstool.c
        lisp/=gosmacs.el
        lisp/case-table.el
        lisp/disp-table.el
        lisp/ehelp.el
        lisp/emacs-lisp/
        lisp/emacs-lisp/helper.el
        lisp/emulation/mlconvert.el
        lisp/float-sup.el
        lisp/hexl.el
        lisp/ledit.el
        lisp/macros.el
        lisp/mail/emacsbug.el
        lisp/mail/mail-utils.el
        lisp/mail/rmailedit.el
        lisp/mail/rmailkwd.el
        lisp/makesum.el
        lisp/novice.el
        lisp/play/dissociate.el
        lisp/play/gomoku.el
        lisp/play/spook.el
        lisp/progmodes/icon.el
        lisp/rect.el
        lisp/tabify.el
        lisp/textmodes/nroff-mode.el
        lisp/textmodes/page.el
        lisp/textmodes/paragraphs.el
        lisp/textmodes/refbib.el
        lisp/textmodes/spell.el
        lisp/textmodes/text-mode.el
        lisp/textmodes/underline.el
        lisp/userlock.el
        lisp/vms-patch.el
        lisp/window.el

* Spot-check a branch-sync change.  [PASS]

  These two changes in CVS...

     2006-01-12 05:20  jhd

        * configure.in, nt/.cvsignore, nt/COPYING, nt/ChangeLog,
        nt/INSTALL, nt/README, nt/addpm.c, nt/addsection.c, nt/cmdproxy.c,
        nt/config.nt, nt/configure.bat, nt/ddeclient.c, nt/emacs.rc,
        nt/envadd.bat, nt/gmake.defs, nt/makefile.w32-in,
        nt/multi-install-info.bat, nt/nmake.defs, nt/paths.h, nt/preprep.c,
        nt/runemacs.c, nt/icons/emacs.ico, nt/icons/emacs21.ico,
        nt/inc/gettext.h, nt/inc/grp.h, nt/inc/sys/socket.h
        (XFT_JHD_BRANCH.[3,1,1,2,2,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2]):

        Update from HEAD

  ...and...

    2006-01-12 05:24  jhd

        * .cvsignore, AUTHORS, COPYING, ChangeLog, INSTALL.CVS,
        Makefile.in, config.bat, config.guess, config.sub, configure,
        [...too many files to list here, really, hundreds of them...]

  ...match this merge commit in Bazaar on the XFT_JHD_BRANCH branch:

      [...]
      ------------------------------------------------------------
      revno: 60734 [merge]
      committer: Jan Djärv <address@hidden>
      timestamp: Thu 2006-01-12 10:25:48 +0000
      message:
        Update from HEAD
      [...]

  ....which is 40000 lines long, so I'm not including it all here.

* Spot-check revno 1.  [PASS]

  This first change in CVS...

      1985-04-17 19:48  jimb

        * lib-src/leditcfns.c (1.1, ttn-vms-21-2-B4, ttn-vms-21-2-B3,
        ttn-vms-21-2-B2, EMACS_19_34, EMACS_21_2, emacs-bidi-base,
        Boehm-GC-base, EMACS_21_3, RMAIL-MBOX-BASE, EMACS_PRETEST_21_2_95,
        EMACS_PRETEST_21_2_94, EMACS_PRETEST_21_2_93,
        EMACS_PRETEST_21_2_92, EMACS_PRETEST_21_2_91, emacs-unicode-base,
        fx-branch-base, EMACS_21_1, EMACS_21_1_BASE, patches_21_0_base,
        EMACS_PRETEST_21_0_106, EMACS_PRETEST_21_0_105,
        EMACS_PRETEST_21_0_104, EMACS_20_2, EMACS_20_4,
        EMACS_PRETEST_21_0_103, EMACS_PRETEST_21_0_102,
        EMACS_PRETEST_21_0_101, EMACS_PRETEST_21_0_100,
        EMACS_PRETEST_21_0_99, EMACS_PRETEST_21_0_98,
        EMACS_PRETEST_21_0_95, EMACS_PRETEST_21_0_93,
        EMACS_PRETEST_21_0_92, EMACS_PRETEST_21_0_91,
        EMACS_PRETEST_21_0_90):

        entered into RCS

  ...matches this first change in Bazaar (remember, all those tag
     names won't show up here):

      ------------------------------------------------------------
      revno: 1
      committer: Jim Blandy <address@hidden>
      timestamp: Thu 1985-04-18 00:48:29 +0000
      message:
        entered into RCS
      added:
        lib-src/
        lib-src/leditcfns.c

* Spot-check similar trunk and branch changes. [PASS]

  These three changes in CVS...

    2002-10-29 04:45  lektu
        * nt/ChangeLog (1.74):
        Added "(tiny change)" marker.
    
    2002-10-29 04:41  lektu
        * lisp/ChangeLog (EMACS_21_1_RC.237):
        Add "(tiny change)" markers.
    
    2002-10-29 04:38  lektu
        * lisp/ChangeLog (1.4464):
        Added "(tiny change)" marker.
    
   ...match these *two* changes in Bazaar:

   (on the EMACS_21_1_RC branch):
      ------------------------------------------------------------
      revno: 40805
      committer: Juanma Barranquero <address@hidden>
      timestamp: Tue 2002-10-29 09:41:08 +0000
      message:
        Add "(tiny change)" markers.
      modified:
        lisp/ChangeLog
      
   (on the trunk branch):
      ------------------------------------------------------------
      revno: 48050
      committer: Juanma Barranquero <address@hidden>
      timestamp: Tue 2002-10-29 09:45:19 +0000
      message:
        Added "(tiny change)" marker.
      modified:
        lisp/ChangeLog
        nt/ChangeLog

* Check that all tags are present.  [?]

  ### Get all the CVS tags.
  $ grep -E '^  [a-zA-Z0-9_-]+: [0-9.]+\.[0-9]' cvs-log.out > cvs-all-tags
  ### then filter out all the ones that are actually branches ###

  ### Get all the Bzr tags.
  $ cd emacs-bzr-repository
  $ for name in *; do (cd ${name}; bzr tags >> .../bzr-all-tags); done
  ### then uniqify them, of course ###

  ### How many are we dealing with?
  $ wc -l cvs-all-tags bzr-all-tags
  1145 cvs-all-tags
  1137 bzr-all-tags

  ### Interesting that those numbers aren't the same. ###
  ### Let's look at the diff:                         ###

  $ 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

  Regarding an earlier conversion that had a similar problem, Andreas
  said in http://article.gmane.org/gmane.emacs.devel/108751 that these
  tags were all present in the git tree.  Is that still the case?

  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?

* 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
  +master-UNNAMED-BRANCH
  +trunk

  Again, in http://article.gmane.org/gmane.emacs.devel/108751 Andreas
  commented that:
  
  "The emacs-unicode branch has been absorbed by the emacs-unicode-2
   branch."  

   (I'm not sure what "absorbed by the emacs-unicode-2 branch" really
   means.  The emacs-unicode branch has commits on it...  Also, what's
   up with 'cedet-branch'?  One explanation could be if a branch didn't
   have any commits then it wouldn't show up in Bazaar.  But
   'cedet-branch' has tons of commits.  )

  "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.'."

  "The master-UNNAMED-BRANCH contains changes belonging to revisions
   that are unreachable from any branch tag.  The name was constructed
   by parsecvs since such unreferenced commits cannot exist in git.
   Actually, this branch combines several such anonymous branches, but
   parsecvs could not tell them apart."

  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!

-Karl