[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: New review conversion of Emacs repository
From: |
Paul Eggert |
Subject: |
Re: New review conversion of Emacs repository |
Date: |
Sat, 13 Sep 2014 12:54:16 -0700 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.1.1 |
Thanks for doing that. As an example of how much faster 'git' is on my
desktop, 'git log' takes 2 seconds, whereas 'bzr log' takes 28 seconds,
with both repositories hot. I am looking forward to the switchover.
I looked at the conversion and have some questions. Sorry, it's been so
long since I reviewed the last conversion that I forgot whether these
issues have come up before. (If they have, please just consider this as
stuff that still worries me mildly. :-)
* On the master/trunk branch, the git repository contains 549 commits
more than the bzr repository does, 117867 versus 117318. I assume this
is because the git repository lists each merged change separately rather
than a single 'Merge from' commit. I wanted to confirm this, though.
For example, git commit 94075d6f559ced1fab36c50bdfa51a612f422080 by
Glenn Morris <address@hidden> dated Sep 7 22:57:24 2014 -0700 isn't
explictly mentioned in the bzr log, and was this because it was part of
the bzr merge that produced trunk bzr 117839 dated 2014-09-07 23:00:58
-0700 by Glenn? Are there any other reasons a commit should appear in
one log but not the other?
* Rewriting revision numbers occasionally makes ChangeLog lines longer
than 80 characters. I propose that we fix this via a manual pass after
the change, something that's done fairly routinely for ChangeLog files
anyway.
* This conversion treats ChangeLog as metadata, and I'd feel more
comfortable if ChangeLog files were treated as data. For example, if I
ask the git repository "Please give me src/ChangeLog as the end of
2012", I git a different answer than if I ask the bzr repository the
same question. (See the diff output below.) I'd feel more comfortable
if these changes were applied to the ChangeLog files via the
abovementioned pass after the conversion, as that way the old git data
will match the old bzr data exactly.
$ diff -u <(cd trunk && bzr cat -r111390 ChangeLog) \
<(cd review6 && git show \
431e43b612777eefb6655728f7979a9c8d87c429:ChangeLog)
--- /dev/fd/63 2014-09-13 11:26:24.254835175 -0700
+++ /dev/fd/62 2014-09-13 11:26:24.255835194 -0700
@@ -1122,7 +1122,7 @@
2012-06-23 Eli Zaretskii <address@hidden>
- Fix the MS-Windows build broken by revno 108687.
+ Fix the MS-Windows build broken by
2012-06-22T21:17:address@hidden
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/dtotimespec.$(O),
$(BLD)/gettime.$(O), $(BLD)/timespec-add.$(O), and
$(BLD)/timespec-sub.$(O).