* Converted git repository available for review
@ 2014-03-21 20:00 Eric S. Raymond
2014-03-21 22:00 ` Stefan
` (4 more replies)
0 siblings, 5 replies; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-21 20:00 UTC (permalink / raw
To: emacs-devel
Clone from git@gitorious.org:emacs-transition/review1.git
Of course this may be missing very some recent commits. On whatever
conversion day gets scheduled I'll do a rebuild, using the lift
script and other conversion machinery that can be found at:
git@gitorious.org:emacs-transition/emacs-transition.git
It's even (gasp!) documented.
The next thing I need is a complete list of private branches that
need to be grafted to the repository on conversion day. I already
know about Aquamacs.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
Fantastic doctrines (like Christianity or Islam or Marxism) require unanimity
of belief. One dissenter casts doubt on the creed of millions. Thus the fear
and the hate; thus the torture chamber, the iron stake, the gallows, the labor
camp, the psychiatric ward. -- Edward Abbey
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-21 20:00 Converted git repository available for review Eric S. Raymond
@ 2014-03-21 22:00 ` Stefan
2014-03-21 22:12 ` Eric S. Raymond
2014-03-21 22:06 ` Juanma Barranquero
` (3 subsequent siblings)
4 siblings, 1 reply; 38+ messages in thread
From: Stefan @ 2014-03-21 22:00 UTC (permalink / raw
To: Eric S. Raymond; +Cc: emacs-devel
> Clone from git@gitorious.org:emacs-transition/review1.git
> Of course this may be missing very some recent commits. On whatever
> conversion day gets scheduled I'll do a rebuild, using the lift
> script and other conversion machinery that can be found at:
I haven't looked at the repository yet, but to help plan for the switch,
I think the switch should happen basically when we release 24.4 (I'd
rather not convert the release branch while the release is still in
preparation, and since we regularly merge from the release branch to the
trunk, that also means that conversion of trunk will have to wait).
Stefan
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-21 20:00 Converted git repository available for review Eric S. Raymond
2014-03-21 22:00 ` Stefan
@ 2014-03-21 22:06 ` Juanma Barranquero
2014-03-22 1:00 ` Paul Eggert
` (2 subsequent siblings)
4 siblings, 0 replies; 38+ messages in thread
From: Juanma Barranquero @ 2014-03-21 22:06 UTC (permalink / raw
To: Eric S. Raymond; +Cc: Emacs developers
On Fri, Mar 21, 2014 at 9:00 PM, Eric S. Raymond <esr@thyrsus.com> wrote:
> Clone from git@gitorious.org:emacs-transition/review1.git
git://gitorious.org/emacs-transition/review1.git
The one you gave requires authentication.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-21 22:00 ` Stefan
@ 2014-03-21 22:12 ` Eric S. Raymond
0 siblings, 0 replies; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-21 22:12 UTC (permalink / raw
To: Stefan; +Cc: emacs-devel
Stefan <monnier@iro.umontreal.ca>:
> I haven't looked at the repository yet, but to help plan for the switch,
> I think the switch should happen basically when we release 24.4
That was my assumption about the timing.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-21 20:00 Converted git repository available for review Eric S. Raymond
2014-03-21 22:00 ` Stefan
2014-03-21 22:06 ` Juanma Barranquero
@ 2014-03-22 1:00 ` Paul Eggert
2014-03-22 3:00 ` Eric S. Raymond
2014-03-22 4:41 ` Converted git repository available for review Juanma Barranquero
2014-03-22 8:02 ` Andreas Schwab
4 siblings, 1 reply; 38+ messages in thread
From: Paul Eggert @ 2014-03-22 1:00 UTC (permalink / raw
To: Eric S. Raymond, emacs-devel
[-- Attachment #1: Type: text/plain, Size: 1011 bytes --]
Thanks. I compared the latest revision (d245cfa) in the converted git
repository's master to the corresponding revision (116808) in the bzr
trunk, and found some discrepancies (see attached). They fall into two
major categories.
1. The git version is missing some changes to .gitignore files. For
example, we removed the arch-tag lines a while ago, but the git version
has resurrected them. I expect the conversion machinery needs to be
tweaked to handle .gitignore files correctly.
2. The git version has rewritten 100 ChangeLog lines, replacing strings
like "revno 108687" with strings like
"2012-06-22T21:17:42Z!eggert@cs.ucla.edu" using the principles you
discussed earlier. In many cases the ChangeLog lines have gotten too
long. I propose converting them to the new form and fixing resulting
line-length problems in the bzr trunk, now, so that the automated
conversion process has nothing to do in this area. I'll volunteer to do
this by hand, as it hardly seems worth automating.
[-- Attachment #2: bzr-git.diff --]
[-- Type: text/plain, Size: 35991 bytes --]
=== modified file 'ChangeLog'
--- ChangeLog 2014-03-07 18:57:11 +0000
+++ ChangeLog 2014-03-21 23:47:26 +0000
@@ -2569,7 +2569,7 @@
2012-06-23 Eli Zaretskii <eliz@gnu.org>
- Fix the MS-Windows build broken by revno 108687.
+ Fix the MS-Windows build broken by 2012-06-22T21:17:42Z!eggert@cs.ucla.edu.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/dtotimespec.$(O),
$(BLD)/gettime.$(O), $(BLD)/timespec-add.$(O), and
$(BLD)/timespec-sub.$(O).
=== modified file 'admin/ChangeLog'
--- admin/ChangeLog 2014-03-07 18:57:11 +0000
+++ admin/ChangeLog 2014-03-21 23:47:26 +0000
@@ -998,7 +998,7 @@
2011-07-07 Juanma Barranquero <lekktu@gmail.com>
* unidata/makefile.w32-in (charprop-SH, charprop-CMD):
- Duplicate change in Makefile.in (revno:105007).
+ Duplicate change in Makefile.in (2011-07-06T22:43:48Z!handa@m17n.org).
2011-07-06 Kenichi Handa <handa@m17n.org>
=== modified file 'admin/unidata/.gitignore'
--- admin/unidata/.gitignore 2011-01-15 23:16:57 +0000
+++ admin/unidata/.gitignore 2014-03-21 23:47:26 +0000
@@ -1,3 +1,4 @@
*.elc
unidata.txt
+# arch-tag: 1b0c916f-3060-47b4-a8c9-cff5c3598adf
=== modified file 'doc/emacs/ChangeLog'
--- doc/emacs/ChangeLog 2014-03-16 02:42:15 +0000
+++ doc/emacs/ChangeLog 2014-03-21 23:47:26 +0000
@@ -3354,7 +3354,7 @@
2010-03-27 Nick Roberts <nickrob@snap.net.nz>
* building.texi: Describe restored GDB/MI functionality
- removed by r99212.
+ removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz.
* emacs.texi: Update node names for building.texi.
2010-03-24 Glenn Morris <rgm@gnu.org>
=== modified file 'doc/lispref/ChangeLog'
--- doc/lispref/ChangeLog 2014-03-19 21:21:01 +0000
+++ doc/lispref/ChangeLog 2014-03-21 23:47:26 +0000
@@ -4418,7 +4418,7 @@
(System Interface): Add @menu entry for "Dynamic Libraries".
* display.texi (Image Formats): Remove description of
- image-library-alist. (Renamed in revno 101949.)
+ image-library-alist. (Renamed in 2010-10-13T14:50:06Z!lekktu@gmail.com.)
2010-10-12 Glenn Morris <rgm@gnu.org>
=== modified file 'doc/misc/ChangeLog'
--- doc/misc/ChangeLog 2014-03-18 21:14:36 +0000
+++ doc/misc/ChangeLog 2014-03-21 23:47:26 +0000
@@ -4722,7 +4722,7 @@
2010-07-19 Juanma Barranquero <lekktu@gmail.com>
- * org.texi: Fix typo in previous change (revno:100847).
+ * org.texi: Fix typo in previous change (2010-07-19T09:47:27Z!carsten.dominik@gmail.com).
2010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
=== modified file 'etc/.gitignore'
--- etc/.gitignore 2013-05-15 20:12:53 +0000
+++ etc/.gitignore 2014-03-21 23:47:26 +0000
@@ -1,2 +1,5 @@
DOC
+DOC-*
icons/
+
+# arch-tag: 617d2467-cd9f-42e2-9115-88e1d44e66e6
=== modified file 'etc/ChangeLog'
--- etc/ChangeLog 2014-03-14 17:03:30 +0000
+++ etc/ChangeLog 2014-03-21 23:47:26 +0000
@@ -402,7 +402,7 @@
2013-03-29 Aidan Gauland <aidalgol@no8wireless.co.nz>
- * NEWS (Eshell): New entry for em-tramp change in r112148
+ * NEWS (Eshell): New entry for em-tramp change in 2013-03-26T22:08:58Z!aidalgol@no8wireless.co.nz
2013-03-21 Eric Ludlam <zappo@gnu.org>
@@ -726,7 +726,7 @@
2012-07-08 Juanma Barranquero <lekktu@gmail.com>
- * tutorials/TUTORIAL.es: Sync with changes in revno:108936.
+ * tutorials/TUTORIAL.es: Sync with changes in 2012-07-07T10:34:37Z!cyd@gnu.org.
2012-07-07 Michael Witten <mfwitten@gmail.com> (tiny change)
@@ -872,7 +872,7 @@
2012-01-14 Eli Zaretskii <eliz@gnu.org>
* tutorials/TUTORIAL.he: Update to follow changes to TUTORIAL in
- revision 106831.
+ 2012-01-10T08:27:22Z!cyd@gnu.org.
2012-01-10 Chong Yidong <cyd@gnu.org>
=== modified file 'leim/.gitignore'
--- leim/.gitignore 2011-01-15 23:16:57 +0000
+++ leim/.gitignore 2014-03-21 23:47:27 +0000
@@ -1,2 +1,4 @@
*.elc
leim-list.el
+
+# arch-tag: 652dce56-7a2f-46ff-8699-c3289ccdc165
=== modified file 'lib-src/.gitignore'
--- lib-src/.gitignore 2011-02-13 18:35:05 +0000
+++ lib-src/.gitignore 2014-03-21 23:47:27 +0000
@@ -1,7 +1,10 @@
DOC
ctags.c
+getopt.h
stamp_BLD
echolisp.tmp
oo/
oo-spd/
+
+# arch-tag: bcd85c02-f779-4fe6-bd45-97a21150aadc
=== modified file 'lib-src/ChangeLog'
--- lib-src/ChangeLog 2014-03-10 00:09:30 +0000
+++ lib-src/ChangeLog 2014-03-21 23:47:27 +0000
@@ -815,7 +815,7 @@
2012-04-14 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (decode_options) [WINDOWSNT]:
- Call ttyname instead of passing its address (typo in revno:106608).
+ Call ttyname instead of passing its address (typo in 2011-12-04T17:13:01Z!lekktu@gmail.com).
2012-04-07 Eli Zaretskii <eliz@gnu.org>
@@ -1570,7 +1570,7 @@
2010-07-12 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (lisp2): Change hebrew.el to hebrew.elc (see
- revno 100789).
+ 2010-07-12T05:25:46Z!handa@etlken).
2010-07-11 Andreas Schwab <schwab@linux-m68k.org>
=== modified file 'lisp/.gitignore'
--- lisp/.gitignore 2011-02-18 05:21:57 +0000
+++ lisp/.gitignore 2014-03-21 23:47:27 +0000
@@ -4,3 +4,5 @@
subdirs.el
finder-inf.el
cus-load.el
+
+# arch-tag: ab6e8f91-fb95-4efe-9c1b-68e21561e68a
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog 2014-03-20 01:20:15 +0000
+++ lisp/ChangeLog 2014-03-21 23:47:27 +0000
@@ -2055,7 +2055,7 @@
* emacs-lisp/eieio-custom.el:
* emacs-lisp/eieio-opt.el: Set generated autoload file to
- 'eieio.el'. This was accidentally removed in rev. 110325.
+ 'eieio.el'. This was accidentally removed in 2012-10-01T18:10:29Z!cyd@gnu.org.
* emacs-lisp/eieio.el: Regenerate autoloads.
2014-01-09 Eric S. Raymond <esr@thyrsus.com>
@@ -2881,7 +2881,7 @@
2013-12-19 Teodor Zlatanov <tzz@lifelogs.com>
* net/eww.el (eww-exit, eww-close, eww-mode-map): Revert change of
- 2013-12-11 (r115470).
+ 2013-12-11T19:01:44Z!tzz@lifelogs.com.
2013-12-19 Stefan Monnier <monnier@iro.umontreal.ca>
@@ -3604,7 +3604,7 @@
2013-12-06 Michael Albinus <michael.albinus@gmx.de>
* progmodes/compile.el (compilation-start):
- * progmodes/grep.el (rgrep): Revert change of 2012-12-20 (r111276).
+ * progmodes/grep.el (rgrep): Revert change 2012-12-20T11:15:38Z!michael.albinus@gmx.de.
* net/tramp-sh.el (tramp-sh-handle-start-file-process):
Handle long command lines, lasting from "sh -c ...". (Bug#16045)
@@ -4472,7 +4472,7 @@
* net/tramp.el (tramp-methods):
* net/tramp-sh.el (tramp-compute-multi-hops): Revert change of
- 2013-10-29 (r114834).
+ 2013-10-29 (2013-10-29T02:50:24Z!dancol@dancol.org).
2013-11-09 Andreas Schwab <schwab@linux-m68k.org>
@@ -7683,7 +7683,7 @@
2013-08-12 Juanma Barranquero <lekktu@gmail.com>
* xml.el (xml-parse-tag-1): Use looking-at (this reverts change in
- revno:113793, which breaks the test suite).
+ 2013-08-11T00:07:48Z!lekktu@gmail.com, which breaks the test suite).
https://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00263.html
2013-08-12 Eli Zaretskii <eliz@gnu.org>
@@ -8144,7 +8144,7 @@
(frameset-move-onscreen): Rename from frameset--move-onscreen. Doc fix.
(frameset--restore-frame): Fix reference to frameset-move-onscreen.
- * dired.el (dired-insert-directory): Revert change in revno:113117
+ * dired.el (dired-insert-directory): Revert change in 2013-06-21T12:24:37Z!lekktu@gmail.com
to use looking-at-p instead of looking-at. (Bug#15028)
2013-08-05 Stefan Monnier <monnier@iro.umontreal.ca>
@@ -9024,7 +9024,7 @@
2013-07-18 Juanma Barranquero <lekktu@gmail.com>
* frame.el (blink-cursor-timer-function, blink-cursor-suspend):
- Add check for W32 (followup to revno:113431).
+ Add check for W32 (followup to 2013-07-16T11:41:06Z!jan.h.d@swipnet.se).
2013-07-18 Michael Albinus <michael.albinus@gmx.de>
@@ -9837,7 +9837,7 @@
2013-06-24 Juanma Barranquero <lekktu@gmail.com>
- * faces.el (face-spec-recalc): Revert part of revno:113147 (bug#14705).
+ * faces.el (face-spec-recalc): Revert part of 2013-06-23T20:29:18Z!lekktu@gmail.com (bug#14705).
2013-06-24 Lars Magne Ingebrigtsen <larsi@gnus.org>
=== modified file 'lisp/ChangeLog.11'
--- lisp/ChangeLog.11 2014-03-09 23:55:11 +0000
+++ lisp/ChangeLog.11 2014-03-21 23:47:27 +0000
@@ -6774,7 +6774,7 @@
2004-05-25 Luc Teirlinck <teirllm@auburn.edu>
* files.el (find-file-noselect-1): Fix bug introduced by
- Revision 1.694. As a side effect, `inhibit-read-only'
+ 2004-05-20T23:29:24Z!teirllm@auburn.edu. As a side effect, `inhibit-read-only'
is again, by default, t during execution of
`find-file-not-found-functions'.
(insert-directory): Check that lines were really inserted by
=== modified file 'lisp/ChangeLog.13'
--- lisp/ChangeLog.13 2014-01-26 00:47:40 +0000
+++ lisp/ChangeLog.13 2014-03-21 23:47:27 +0000
@@ -3373,7 +3373,7 @@
allout regexp's formfeed alternative group, when present.
(allout-write-file-hook-handler): Rectify mangling of the error
- handling. It was broken in version 1.100, where an `error'
+ handling. It was broken in 2007-12-06T19:56:41Z!deego@gnufans.org, where an `error'
condition-case handler was apparently reformatted as if it was a
call to the error function. An apparent repair attempt in version
1.101 situated the original body of the error handling code as
@@ -6984,7 +6984,7 @@
2007-11-19 Juanma Barranquero <lekktu@gmail.com>
* replace.el (map-query-replace-regexp): Doc fix (revert part of
- revision 1.104, made on 2000-05-21 with no ChangeLog entry).
+ 2000-05-21T17:04:47Z!fx@gnu.org with no ChangeLog entry).
2007-11-19 Dan Nicolaescu <dann@ics.uci.edu>
@@ -14462,7 +14462,7 @@
2007-07-15 Karl Fogel <kfogel@red-bean.com>
- * bookmark.el: Revert revision 1.90 (commitid mWoPbju3pgNotDps),
+ * bookmark.el: Revert 2007-07-13T18:16:17Z!kfogel@red-bean.com,
thus restoring bookmark bindings to three slots under C-x r. See
http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00705.html.
=== modified file 'lisp/ChangeLog.14'
--- lisp/ChangeLog.14 2014-01-11 03:55:50 +0000
+++ lisp/ChangeLog.14 2014-03-21 23:47:27 +0000
@@ -5336,7 +5336,7 @@
2008-11-19 Karl Fogel <kfogel@red-bean.com>
* bookmark.el (bookmark-jump-noselect): Move the deprecation
- notice into the doc string, following up to revision 1.117.
+ notice into the doc string, following up to 2008-10-29T17:42:49Z!cyd@stupidchicken.com.
2008-11-19 Lute Kamstra <lute@gnu.org>
=== modified file 'lisp/ChangeLog.15'
--- lisp/ChangeLog.15 2014-03-07 00:01:19 +0000
+++ lisp/ChangeLog.15 2014-03-21 23:47:27 +0000
@@ -777,7 +777,7 @@
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
- (ert-results-pop-to-timings): Revert parts of change 103083 that
+ (ert-results-pop-to-timings): Revert parts of change 2011-02-02T17:59:44Z!sds@gnu.org that
were incorrect and unnecessary. This should make `make check'
pass again.
@@ -1512,7 +1512,7 @@
* progmodes/compile.el (compilation-enable-debug-messages):
Add a variable to make the parsing messages introduced in
- revno:103013 optional.
+ 2011-01-28T22:12:05Z!monnier@iro.umontreal.ca optional.
(compilation-parse-errors, compilation--flush-parse): Use it.
2011-01-31 Deniz Dogan <deniz.a.m.dogan@gmail.com>
@@ -3172,7 +3172,7 @@
* bookmark.el (bookmark-name-from-full-record): Rename back to
this original name from `bookmark-name-from-record' reverting part
- of rev 102609 / kfogel@red-bean.com-20101208080927-5j9jqnb2xvcw4ogm.
+ of 2010-12-08T08:09:27Z!kfogel@red-bean.com / kfogel@red-bean.com-20101208080927-5j9jqnb2xvcw4ogm.
As Drew Adams pointed out, there was no reason to cause churn for
third-party callers. (Bug#7609)
@@ -6243,7 +6243,7 @@
2010-10-01 Juanma Barranquero <lekktu@gmail.com>
- * server.el (server-start): Revert part of revno 101688.
+ * server.el (server-start): Revert part of 2010-09-30T02:53:26Z!lekktu@gmail.com.
Let's not break compatibility gratuitously, shall we?
2010-09-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -6604,7 +6604,7 @@
2010-09-20 Juanma Barranquero <lekktu@gmail.com>
- * subr.el (y-or-n-p): Remove leftover code from revno 101459.
+ * subr.el (y-or-n-p): Remove leftover code from 2010-09-17T13:30:30Z!monnier@iro.umontreal.ca.
* emacs-lisp/smie.el (smie-indent--hanging-p): Use `smie-indent--bolp'.
@@ -6883,7 +6883,7 @@
2010-09-13 Juanma Barranquero <lekktu@gmail.com>
- Port tramp-related Makefile changes of revnos 101381, 101422 to Windows.
+ Port tramp-related Makefile changes of 2010-09-08T14:42:54Z!michael.albinus@gmx.de, 2010-09-13T15:17:01Z!michael.albinus@gmx.de to Windows.
* makefile.w32-in (LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
(TRAMP_SRC): New macro.
($(lisp)/net/tramp-loaddefs.el): New target.
@@ -11292,7 +11292,7 @@
2010-04-25 Jan Djärv <jan.h.d@swipnet.se>
* tool-bar.el (tool-bar-local-item-from-menu): Revert unintended
- checkin in rev 100010.
+ checkin in 2010-04-23T16:26:11Z!monnier@iro.umontreal.ca.
2010-04-24 Glenn Morris <rgm@gnu.org>
@@ -12227,7 +12227,7 @@
2010-03-27 Nick Roberts <nickrob@snap.net.nz>
- Restore GDB/MI functionality removed by r99212.
+ Restore GDB/MI functionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz.
* progmodes/gdb-mi.el: Restore.
* progmodes/gdb-ui.el: Remove.
* progmodes/gud.el: Re-accommodate for gdb-mi.el.
=== modified file 'lisp/ChangeLog.16'
--- lisp/ChangeLog.16 2014-01-11 03:55:50 +0000
+++ lisp/ChangeLog.16 2014-03-21 23:47:27 +0000
@@ -2468,7 +2468,7 @@
* progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class",
"module" and "def" to have indentation before them.
- Regression from revno:109911 (see the new test).
+ Regression from 2012-09-07T04:15:56Z!dgutov@yandex.ru (see the new test).
* progmodes/ruby-mode.el: Bump the version to 1.2 (Bug#13200).
@@ -4062,7 +4062,7 @@
* ansi-color.el (ansi-color-apply-sequence): Implement SGR codes
39 and 49 (bug#12792). Also, treat unimplemented parameters as 0,
- thereby restoring the behavior of revisions prior to 109621.
+ thereby restoring the behavior of revisions prior to 2012-08-15T03:33:55Z!monnier@iro.umontreal.ca.
2012-11-13 Fabián Ezequiel Gallina <fgallina@cuca>
@@ -4086,7 +4086,7 @@
* progmodes/ruby-mode.el (ruby-move-to-block): When moving
backward, always stop at indentation. Reverts the change from
- 109576 (Bug#12851).
+ 2012-08-12T22:06:56Z!monnier@iro.umontreal.ca (Bug#12851).
2012-11-13 Glenn Morris <rgm@gnu.org>
@@ -8856,7 +8856,7 @@
* bindings.el (top): Use `mapc' instead of `mapcar'.
- * loadup.el (top): Remove bogus `if' choice (brought by revno:88805).
+ * loadup.el (top): Remove bogus `if' choice (brought by 2008-06-21T01:38:39Z!monnier@iro.umontreal.ca).
2012-07-13 Michael Albinus <michael.albinus@gmx.de>
@@ -9434,7 +9434,7 @@
2012-06-23 Juanma Barranquero <lekktu@gmail.com>
- * makefile.w32-in (COMPILE_FIRST): Synch with changes in revno:108688.
+ * makefile.w32-in (COMPILE_FIRST): Synch with changes in 2012-06-22T21:24:54Z!monnier@iro.umontreal.ca.
2012-06-23 Stefan Monnier <monnier@iro.umontreal.ca>
@@ -9737,7 +9737,7 @@
2012-06-15 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in (COMPILE_FIRST): Synch with makefile.in changes
- in revno:88864.
+ in 2008-06-22T13:57:28Z!monnier@iro.umontreal.ca.
2012-06-15 Fabián Ezequiel Gallina <fgallina@cuca>
@@ -10421,7 +10421,7 @@
2012-06-08 Juanma Barranquero <lekktu@gmail.com>
- * textmodes/texinfmt.el: Fix bug#11640 (reverts part of revno:89810).
+ * textmodes/texinfmt.el: Fix bug#11640 (reverts part of 2008-07-31T05:33:56Z!dann@ics.uci.edu).
(texinfo-format-printindex): Use `texinfo-sort-region' in all platforms,
instead of calling external sort utility.
(texinfo-sort-region, texinfo-sort-startkeyfun): Restore functions.
@@ -14293,7 +14293,7 @@
2012-02-22 Alan Mackenzie <acm@muc.de>
- * progmodes/cc-mode.el: Revert change #107149 from 2012-02-06.
+ * progmodes/cc-mode.el: Revert change #2012-02-06T22:08:41Z!larsi@gnus.org from 2012-02-06.
2012-02-22 Glenn Morris <rgm@gnu.org>
@@ -15615,8 +15615,8 @@
2011-12-19 Vincent Belaïche <vincentb1@users.sourceforge.net>
- * ses.el: Ooops... undo changes of revision 106664, as trunk
- branch is feature frozen, and revision 106664 was a feature
+ * ses.el: Ooops... undo changes of 2011-12-11T14:49:48Z!vincentb1@users.sourceforge.net, as trunk
+ branch is feature frozen, and 2011-12-11T14:49:48Z!vincentb1@users.sourceforge.net was a feature
addition.
2011-12-18 Jan Djärv <jan.h.d@swipnet.se>
@@ -16175,7 +16175,7 @@
2011-11-24 Juri Linkov <juri@jurta.org>
- * view.el (view-buffer): Revert revno:105285 from 2011-07-19 (bug#8615).
+ * view.el (view-buffer): Revert 2011-07-19T15:01:49Z!larsi@gnus.org from 2011-07-19 (bug#8615).
2011-11-24 Glenn Morris <rgm@gnu.org>
@@ -19213,8 +19213,8 @@
2011-08-10 Juri Linkov <juri@jurta.org>
* progmodes/grep.el (rgrep): Don't bind `process-connection-type'.
- This finishes incomplete reversion of revno:104787 (2011-06-30)
- intended by revno:104988 (2011-07-06).
+ This finishes incomplete reversion of 2011-06-30T01:09:13Z!larsi@gnus.org
+ intended by 2011-07-06T15:49:19Z!larsi@gnus.org.
2011-08-09 Chong Yidong <cyd@stupidchicken.com>
@@ -24158,11 +24158,11 @@
* autorevert.el (auto-revert-handler):
Bind `remote-file-name-inhibit-cache', not `tramp-cache-inhibit-cache',
- which was removed in revno:101730 (2010-10-02).
+ which was removed in 2010-10-02T13:21:43Z!michael.albinus@gmx.de.
Don't quote lambda.
* image-mode.el (image-transform-set-scale):
- Fix change in revno:103877 (2011-04-09).
+ Fix change in 2011-04-09T20:28:01Z!cyd@stupidchicken.com.
2011-04-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -24346,7 +24346,7 @@
* font-lock.el (font-lock-refresh-defaults):
Don't bind `hi-lock--inhibit-font-lock-hook', removed in
- revno:99634.2.463 (2010-10-09) and revno:101913 (2010-10-12).
+ 2010-10-09T04:09:19Z!cyd@stupidchicken.com and 2010-10-11T23:57:49Z!lekktu@gmail.com (2010-10-12).
* info.el (Info-directory-list, Info-read-node-name-2)
(Info-split-parameter-string): Doc fixes.
=== modified file 'lisp/cedet/ChangeLog'
--- lisp/cedet/ChangeLog 2014-03-04 08:37:48 +0000
+++ lisp/cedet/ChangeLog 2014-03-21 23:47:27 +0000
@@ -759,7 +759,7 @@
* semantic/bovine/el.el: Add `semantic-default-elisp-setup' to
`emacs-lisp-mode-hook'. This was accidentally removed during the
- CEDET update (rev. 110325).
+ CEDET update (2012-10-01T18:10:29Z!cyd@gnu.org).
2012-10-07 David Engster <deng@randomsample.de>
=== modified file 'lisp/eshell/.gitignore'
--- lisp/eshell/.gitignore 2011-01-15 23:16:57 +0000
+++ lisp/eshell/.gitignore 2014-03-21 23:47:28 +0000
@@ -1,2 +1,3 @@
esh-groups.el
+# arch-tag: 270e983f-fee5-4b6d-a00b-c1bafdee8690
=== modified file 'lisp/international/.gitignore'
--- lisp/international/.gitignore 2013-11-29 11:25:04 +0000
+++ lisp/international/.gitignore 2014-03-21 23:47:28 +0000
@@ -1,16 +1,1 @@
-# Generated Unicode files.
-charprop.el
-uni-bidi.el
-uni-category.el
-uni-combining.el
-uni-comment.el
-uni-decimal.el
-uni-decomposition.el
-uni-digit.el
-uni-lowercase.el
-uni-mirrored.el
-uni-name.el
-uni-numeric.el
-uni-old-name.el
-uni-titlecase.el
-uni-uppercase.el
+*.elc
=== modified file 'lisp/org/ChangeLog'
--- lisp/org/ChangeLog 2014-03-18 01:13:00 +0000
+++ lisp/org/ChangeLog 2014-03-21 23:47:28 +0000
@@ -913,7 +913,7 @@
hooks are local hooks.
* org-agenda.el (org-agenda-mode): Use `org-add-hook' and merge
- upstream change from Emacs revno r112320.
+ upstream change from Emacs 2013-04-18T00:12:33Z!monnier@iro.umontreal.ca.
* ob-core.el (org-babel-pop-to-session-maybe): Fix docstring.
(org-babel-pop-to-session-maybe): Use true function's name,
=== modified file 'msdos/ChangeLog'
--- msdos/ChangeLog 2014-01-22 01:43:37 +0000
+++ msdos/ChangeLog 2014-03-21 23:47:29 +0000
@@ -427,10 +427,10 @@
2010-10-15 Eli Zaretskii <eliz@gnu.org>
* sed1v2.inp: Use $(..) instead of ${..} in all edit commands.
- Needed because of changes in revno 101897.
+ Needed because of changes in 2010-10-10T14:43:05Z!dann@ics.uci.edu.
* sed6.inp (mkinfodir): Edit to avoid Unix shell-isms. Needed
- because of changes in revno 101876.
+ because of changes in 2010-10-09T18:31:12Z!rgm@gnu.org.
2010-10-10 Dan Nicolaescu <dann@ics.uci.edu>
@@ -527,7 +527,7 @@
2010-06-26 Eli Zaretskii <eliz@gnu.org>
* mainmake.v2 (version): Use emacs_version[] in src/emacs.c
- instead of lisp/version.el (see revno 100306).
+ instead of lisp/version.el (see 2010-05-15T21:11:37Z!raeburn@raeburn.org).
* sed1v2.inp (MKDEPDIR): Edit to empty.
Delete lines in rules that invoke $(MKDEPDIR). Fix editing rules
=== modified file 'nt/.gitignore'
--- nt/.gitignore 2011-01-15 23:16:57 +0000
+++ nt/.gitignore 2014-03-21 23:47:29 +0000
@@ -3,3 +3,5 @@
oo/
oo-spd/
+
+# arch-tag: a25a0376-d3d9-4b3e-a52a-7c3eac9fdba3
=== modified file 'nt/ChangeLog'
--- nt/ChangeLog 2014-03-03 04:57:26 +0000
+++ nt/ChangeLog 2014-03-21 23:47:29 +0000
@@ -1010,7 +1010,7 @@
2012-06-23 Eli Zaretskii <eliz@gnu.org>
- Fix the MS-Windows build broken by revno 108687.
+ Fix the MS-Windows build broken by 2012-06-22T21:17:42Z!eggert@cs.ucla.edu.
* inc/sys/time.h (struct timespec): Define.
2012-06-16 Eli Zaretskii <eliz@gnu.org>
@@ -1384,7 +1384,7 @@
2011-04-06 Eli Zaretskii <eliz@gnu.org>
* config.nt (NO_INLINE, ATTRIBUTE_FORMAT)
- (ATTRIBUTE_FORMAT_PRINTF): Define, as followup to revision 103841
+ (ATTRIBUTE_FORMAT_PRINTF): Define, as followup to 2011-04-06T05:19:39Z!eggert@cs.ucla.edu
on the trunk on 2011-04-06.
2011-03-27 Glenn Morris <rgm@gnu.org>
@@ -2404,7 +2404,7 @@
2003-01-21 David Ponce <david@dponce.com>
- * emacs.rc (32649): Declare hand cursor resource.
+ * emacs.rc (2000-10-19T07:24:01Z!eliz@gnu.org): Declare hand cursor resource.
2003-01-15 Andrew Innes <andrewi@gnu.org>
=== modified file 'src/.gitignore'
--- src/.gitignore 2012-08-05 21:44:21 +0000
+++ src/.gitignore 2014-03-21 23:47:29 +0000
@@ -2,7 +2,8 @@
config.h
epaths.h
stamp_BLD
-stamp-h.in
oo/
oo-spd/
+
+# arch-tag: 0648c91e-6070-4cc5-a029-cade1f8b6098
=== modified file 'src/ChangeLog'
--- src/ChangeLog 2014-03-20 01:21:52 +0000
+++ src/ChangeLog 2014-03-21 23:47:29 +0000
@@ -598,7 +598,7 @@
2014-01-27 K. Handa <handa@gnu.org>
- Fix bug#16286 by a different method from revno:116158 (2014-01-26),
+ Fix bug#16286 by a different method from 2014-01-26T00:32:30Z!eggert@cs.ucla.edu,
to preserve the code detection behavior of 24.3.
* coding.h (struct coding_system): New member detected_utf8_bytes.
* coding.c (detect_coding_utf_8): Set coding->detected_utf8_bytes.
@@ -3561,7 +3561,7 @@
* image.c (GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE): Move back
after inclusion of gif_lib.h, thus fixing compiler warnings caused
- by revision 114614 (commit of 2013-10-10).
+ by 2013-10-10T19:15:33Z!eggert@cs.ucla.edu.
2013-10-11 Eli Zaretskii <eliz@gnu.org>
@@ -6854,7 +6854,7 @@
* keyboard.c (kbd_buffer_get_event):
* w32term.c (x_focus_changed): Port FOCUS_(IN|OUT)_EVENT changes to W32.
- Followup to revno:113431.
+ Followup to 2013-07-16T11:41:06Z!jan.h.d@swipnet.se.
2013-07-18 Paul Eggert <eggert@cs.ucla.edu>
=== modified file 'src/ChangeLog.10'
--- src/ChangeLog.10 2014-01-15 03:06:07 +0000
+++ src/ChangeLog.10 2014-03-21 23:47:29 +0000
@@ -19757,7 +19757,7 @@
* keymap.c (accessible_keymaps_1): Break cycles but without preventing
multiple occurrences of the same keymap under different prefixes.
- (Faccessible_keymaps): Remove code redundant since rev 1.82.
+ (Faccessible_keymaps): Remove code redundant since 1994-08-03T07:39:00Z!rms@gnu.org.
2003-03-16 Jason Rumney <jasonr@gnu.org>
=== modified file 'src/ChangeLog.11'
--- src/ChangeLog.11 2014-01-26 00:47:40 +0000
+++ src/ChangeLog.11 2014-03-21 23:47:29 +0000
@@ -811,10 +811,10 @@
(GLOBAL_SOURCES): New variable.
* globals.h: Remove.
* nsselect.m (Vselection_alist): Define. Reverts part of
- r102904.
+ 2011-01-19T22:11:33Z!jan.h.d@swipnet.se.
* buffer.c: Don't use "no_cell" for name of kill-buffer-hook's
variable.
- * xselect.c (Vselection_alist): Define. Reverts part of r102908.
+ * xselect.c (Vselection_alist): Define. Reverts part of 2011-01-19T23:32:42Z!eggert@cs.ucla.edu.
2011-02-08 Kenichi Handa <handa@m17n.org>
@@ -1870,7 +1870,7 @@
Sun cc complains about this.
* coding.c (decode_coding_emacs_mule): Remove unreachable code.
- This is a typo left over from revno 95090 dated 2009-03-06,
+ This is a typo left over from 2009-03-06T07:51:52Z!handa@m17n.org,
which fixed Bug#2370. Caught by Sun cc.
2011-01-15 Martin Rudalics <rudalics@gmx.at>
@@ -3187,7 +3187,7 @@
2010-10-15 Eli Zaretskii <eliz@gnu.org>
* unexcoff.c (make_hdr): Fix prototype according to changes in
- revno 101757.
+ 2010-10-03T13:59:56Z!dann@ics.uci.edu.
* image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
@@ -3568,7 +3568,7 @@
2010-09-30 Juanma Barranquero <lekktu@gmail.com>
* w32console.c (vga_stdcolor_name): Remove unused function;
- presumed dead after revno 82799 (2007-11-30).
+ presumed dead after 2007-11-30T13:57:21Z!jasonr@gnu.org.
2010-09-29 Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -4779,7 +4779,7 @@
* w32fns.c <w32_frame_parm_handlers>: Add a slot for the
x_set_tool_bar_position handler, needed to support changes from
- 2010-07-29 (revno 100939) for positioning the tool bar. (Bug#6796)
+ 2010-07-29T16:49:59Z!jan.h.d@swipnet.se for positioning the tool bar. (Bug#6796)
2010-08-16 Jan Djärv <jan.h.d@swipnet.se>
@@ -4859,7 +4859,7 @@
(report_error, report_error_1): Ditto.
(write_segment): Remove "#if 0" unused code.
(make_hdr): Remove code that was "#ifndef NO_REMAP" before
- NO_REMAP was removed (in revno 100928).
+ NO_REMAP was removed (in 2010-07-29T03:25:08Z!dann@ics.uci.edu).
(start_of_text): Remove unused function (was used only if NO_REMAP
was NOT defined).
@@ -5302,7 +5302,7 @@
2010-08-06 Juanma Barranquero <lekktu@gmail.com>
- Fix changes in revnos 100982..100984 for Windows build.
+ Fix changes in 2010-08-05T23:15:24Z!dann@ics.uci.edu..2010-08-05T23:34:12Z!dann@ics.uci.edu for Windows build.
* xmenu.c [USE_X_TOOLKIT || USE_GTK]:
Don't declare xmalloc_widget_value and digest_single_submenu.
@@ -5953,7 +5953,7 @@
2010-07-15 Eli Zaretskii <eliz@gnu.org>
* fringe.c (update_window_fringes): Restore mistakenly reverted
- code from revno 99854.1.6 merged in revno 99950.
+ code from 2010-04-17T12:33:05Z!eliz@gnu.org merged in 2010-04-20T13:31:28Z!eliz@gnu.org.
2010-07-14 Jan Djärv <jan.h.d@swipnet.se>
@@ -6759,7 +6759,7 @@
2010-07-04 Juanma Barranquero <lekktu@gmail.com>
- * strftime.c: Revert conversion to standard C (revno:100708).
+ * strftime.c: Revert conversion to standard C (2010-07-04T07:50:25Z!dann@ics.uci.edu).
2010-07-04 Juanma Barranquero <lekktu@gmail.com>
=== modified file 'src/ChangeLog.12'
--- src/ChangeLog.12 2014-01-21 08:49:46 +0000
+++ src/ChangeLog.12 2014-03-21 23:47:29 +0000
@@ -2606,7 +2606,7 @@
2012-11-30 Juanma Barranquero <lekktu@gmail.com>
* doc.c (Fdocumentation): Re-add handling of function-documentation,
- accidentally removed in revno:110851 (bug#13034).
+ accidentally removed in 2012-11-09T04:10:16Z!monnier@iro.umontreal.ca (bug#13034).
2012-11-29 Dmitry Antipov <dmantipov@yandex.ru>
@@ -10752,7 +10752,7 @@
2012-06-23 Eli Zaretskii <eliz@gnu.org>
- Fix the MS-Windows build broken by revno 108687.
+ Fix the MS-Windows build broken by 2012-06-22T21:17:42Z!eggert@cs.ucla.edu.
* w32.c (fdutimens): New function.
* w32proc.c (sys_select): Adapt to change in the EMACS_TIME type.
@@ -11337,7 +11337,7 @@
2012-06-08 Juanma Barranquero <lekktu@gmail.com>
* dispnew.c (showing_window_margins_p): Wrap in #if 0 to prevent unused
- function warning (the only call is inside #if 0 since revno:108521).
+ function warning (the only call is inside #if 0 since 2012-06-08T08:44:45Z!eliz@gnu.org).
2012-06-08 Eli Zaretskii <eliz@gnu.org>
@@ -12496,7 +12496,7 @@
2012-05-22 Juanma Barranquero <lekktu@gmail.com>
- * makefile.w32-in: Follow-up to revno:108341.
+ * makefile.w32-in: Follow-up to 2012-05-22T16:20:27Z!eggert@cs.ucla.edu.
(TAGS, TAGS-gmake, CONFIG_H): Remove further references to m/intel386.h.
2012-05-22 Paul Eggert <eggert@cs.ucla.edu>
@@ -15352,7 +15352,7 @@
2011-09-17 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (produce_stretch_glyph): Another fix for changes made on
- 2011-08-30 (revision 105619). (Bug#9530)
+ 2011-08-30T17:32:44Z!eliz@gnu.org. (Bug#9530)
2011-09-17 Eli Zaretskii <eliz@gnu.org>
@@ -15462,7 +15462,7 @@
2011-09-11 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (produce_stretch_glyph): Fix a typo made in changes from
- 2011-08-30 (revision 105619). (Bug#9475)
+ 2011-08-30T17:32:44Z!eliz@gnu.org. (Bug#9475)
2011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -16926,7 +16926,7 @@
2011-07-23 Eli Zaretskii <eliz@gnu.org>
* xfns.c (unwind_create_frame) [GLYPH_DEBUG]: Adapt to changes in
- revision 84777 on 2008-02-22.
+ 2008-02-22T17:42:09Z!monnier@iro.umontreal.ca.
* xdisp.c (move_it_in_display_line_to): Record the best matching
position for TO_CHARPOS while scanning the line, and restore it on
@@ -17709,7 +17709,7 @@
Qgnutls_bootprop_verify_error (which is no longer used).
* eval.c (find_handler_clause): Remove parameters `sig' and `data',
- unused since revno:102982 (2011-01-26). All callers changed.
+ unused since 2011-01-26T20:02:07Z!monnier@iro.umontreal.ca. All callers changed.
Also (re)move comments that are misplaced or no longer relevant.
2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -19353,8 +19353,8 @@
* eval.c (Qdebug): Now static.
* lisp.h (Qdebug): Remove decl. This reverts a part of the
- 2011-04-26 change (bzr 104015) that inadvertently undid part of
- the 2011-04-14 change (bzr 103913).
+ 2011-04-26T11:26:05Z!dan.colascione@gmail.com that inadvertently undid part of
+ 2011-04-14T19:34:42Z!eggert@cs.ucla.edu.
2011-05-29 Chong Yidong <cyd@stupidchicken.com>
@@ -19657,7 +19657,7 @@
2011-05-18 Christoph Scholtes <cschol2112@googlemail.com>
* menu.c: Include limits.h (fixes the MS-Windows build broken by
- revision 104625).
+ 2011-06-18T18:49:19Z!cyd@stupidchicken.com).
2011-05-18 Paul Eggert <eggert@cs.ucla.edu>
@@ -19837,7 +19837,7 @@
2011-05-06 Eli Zaretskii <eliz@gnu.org>
* lread.c: Include limits.h (fixes the MS-Windows build broken by
- revision 104134).
+ 2011-05-06T07:13:19Z!eggert@cs.ucla.edu).
2011-05-06 Paul Eggert <eggert@cs.ucla.edu>
@@ -21608,14 +21608,14 @@
2011-04-02 Juanma Barranquero <lekktu@gmail.com>
* xdisp.c (display_count_lines): Remove parameter `start',
- unused since revno:20537 (1998-01-01). All callers changed.
+ unused since 1998-01-01T02:27:27Z!rms@gnu.org. All callers changed.
(get_char_face_and_encoding): Remove parameter `multibyte_p',
- unused since revno:87605 (2008-05-14). All callers changed.
+ unused since 2008-05-14T01:40:23Z!handa@m17n.org. All callers changed.
(fill_stretch_glyph_string): Remove parameters `row' and `area',
- unused at least since Kim's GUI unification at revno:50135 (2003-03-16)
+ unused at least since Kim's GUI unification at 2003-03-16T20:45:46Z!storm@cua.dk
and thereabouts. All callers changed.
(get_per_char_metric): Remove parameter `f', unused since
- revno:87605 (2008-05-14). All callers changed.
+ 2008-05-14T01:40:23Z!handa@m17n.org. All callers changed.
2011-04-02 Jim Meyering <meyering@redhat.com>
@@ -21719,11 +21719,11 @@
* dispextern.h (move_it_by_lines):
* xdisp.c (move_it_by_lines): Remove parameter `need_y_p', unused
- since revno:34925 (2000-12-29). All callers changed.
+ since 2000-12-29T14:24:09Z!gerd@gnu.org. All callers changed.
(message_log_check_duplicate): Remove parameters `prev_bol' and
- `this_bol', unused since revno:20537 (1998-01-01). All callers changed.
+ `this_bol', unused since 1998-01-01T02:27:27Z!rms@gnu.org. All callers changed.
(redisplay_internal): Remove parameter `preserve_echo_area',
- unused since revno:25013 (1999-07-21). All callers changed.
+ unused since 1999-07-21T21:43:52Z!gerd@gnu.org. All callers changed.
* indent.c (Fvertical_motion):
* window.c (window_scroll_pixel_based, Frecenter):
@@ -21819,12 +21819,12 @@
2011-03-28 Juanma Barranquero <lekktu@gmail.com>
* coding.c (encode_designation_at_bol): Remove parameter `charbuf_end',
- unused since revno:43563.1.17 (2002-03-01) and revno:84043 (2008-02-1).
+ unused since 2002-03-01T01:17:24Z!handa@m17n.org and 2008-02-01T16:01:31Z!miles@gnu.org.
All callers changed.
* lisp.h (multibyte_char_to_unibyte):
* character.c (multibyte_char_to_unibyte): Remove parameter `rev_tbl',
- unused since revno:43563.1.16 (2002-03-01) and revno:84043 (2008-02-1).
+ unused since 2002-03-01T01:16:34Z!handa@m17n.org and 2008-02-01T16:01:31Z!miles@gnu.org.
* character.h (CHAR_TO_BYTE8):
* cmds.c (internal_self_insert):
* editfns.c (general_insert_function):
@@ -21854,23 +21854,23 @@
* dispextern.h (string_buffer_position): Remove declaration.
* print.c (strout): Remove parameter `multibyte', unused since
- revno:25356 (1999-08-21). All callers changed.
+ 1999-08-21T19:30:21Z!gerd@gnu.org. All callers changed.
* search.c (boyer_moore): Remove parameters `len', `pos' and `lim',
- never used since function introduction in revno:20870 (1998-02-08).
+ never used since function introduction in 1998-02-08T21:33:56Z!rms@gnu.org.
All callers changed.
* w32.c (_wsa_errlist): Use braces for struct initializers.
* xdisp.c (string_buffer_position_lim): Remove parameter `w',
- never used since function introduction in revno:36704 (2001-03-09).
+ never used since function introduction in 2001-03-09T18:41:50Z!gerd@gnu.org.
All callers changed.
(string_buffer_position): Likewise. Also, make static (it's never
used outside xdisp.c).
(cursor_row_p): Remove parameter `w', unused since
- revno:32591 (2000-10-17). All callers changed.
+ 2000-10-17T16:08:57Z!gerd@gnu.org. All callers changed.
(decode_mode_spec): Remove parameter `precision', introduced during
- Gerd Moellmann's rewrite at revno:25013 (1999-07-21), but never used.
+ Gerd Moellmann's rewrite at 1999-07-21T21:43:52Z!gerd@gnu.org, but never used.
All callers changed.
2011-03-27 Jan Djärv <jan.h.d@swipnet.se>
@@ -21912,15 +21912,15 @@
global variable `wget_enum_handle'.
* keymap.c (describe_vector): Remove parameters `indices' and
- `char_table_depth', unused since revno:43563.1.32 (2002-03-01).
+ `char_table_depth', unused since 2002-03-01T01:43:26Z!handa@m17n.org.
(describe_map, Fdescribe_vector): Adjust calls to `describe_vector'.
* keyboard.h (timer_check, show_help_echo): Remove unused parameters.
* keyboard.c (timer_check): Remove parameter `do_it_now',
- unused since revno:14998 (1996-04-12).
+ unused since 1996-04-12T06:01:29Z!rms@gnu.org.
(show_help_echo): Remove parameter `ok_to_overwrite_keystroke_echo',
- unused since revno:86854 (2008-04-19).
+ unused since 2008-04-19T19:30:53Z!monnier@iro.umontreal.ca.
* keyboard.c (read_char):
* w32menu.c (w32_menu_display_help):
@@ -21933,7 +21933,7 @@
* xmenu.c (x_menu_wait_for_event): Adjust calls to `timer_check'.
* insdel.c (adjust_markers_gap_motion):
- Remove; no-op since revno:20569 (1998-01-02).
+ Remove; no-op since 1998-01-02T21:29:48Z!rms@gnu.org.
(gap_left, gap_right): Don't call it.
2011-03-25 Chong Yidong <cyd@stupidchicken.com>
@@ -22675,7 +22675,7 @@
w32console.c and msdos.c.
* makefile.w32-in ($(BLD)/term.$(O), ($(BLD)/tparam.$(O)):
- Depend on $(SRC)/tparam.h, see revno 103623.
+ Depend on $(SRC)/tparam.h, see 2011-03-11T07:24:21Z!eggert@cs.ucla.edu.
2011-03-11 Paul Eggert <eggert@cs.ucla.edu>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 1:00 ` Paul Eggert
@ 2014-03-22 3:00 ` Eric S. Raymond
2014-03-22 3:37 ` Paul Eggert
0 siblings, 1 reply; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-22 3:00 UTC (permalink / raw
To: Paul Eggert; +Cc: emacs-devel
Paul Eggert <eggert@cs.ucla.edu>:
> Thanks. I compared the latest revision (d245cfa) in the converted
> git repository's master to the corresponding revision (116808) in
> the bzr trunk, and found some discrepancies (see attached). They
> fall into two major categories.
>
> 1. The git version is missing some changes to .gitignore files.
> For example, we removed the arch-tag lines a while ago, but the git
> version has resurrected them. I expect the conversion machinery
> needs to be tweaked to handle .gitignore files correctly.
Take a look at the relevant section of the lift script. What I've
done is treat the Bazaar ignore files as authoritative for those
revisions during which Bazaar was in use, ignoring .gitignores during
that period. The other major possibility would be to simply remove
.bzrignores where .gitignore files exist.
I don't care. Either is doable; somebody make a policy choice, please?
> 2. The git version has rewritten 100 ChangeLog lines, replacing
> strings like "revno 108687" with strings like
> "2012-06-22T21:17:42Z!eggert@cs.ucla.edu" using the principles you
> discussed earlier. In many cases the ChangeLog lines have gotten
> too long. I propose converting them to the new form and fixing
> resulting line-length problems in the bzr trunk, now, so that the
> automated conversion process has nothing to do in this area. I'll
> volunteer to do this by hand, as it hardly seems worth automating.
Here's I could do instead: select commit comments and ChangeLog
revisions with overlong lines, mailboxize them, and craft some filter
commands to fix up the line breaks. That would fix up the history
for maximumm readability.
But how much do we care about fewer than 108 overlong lines, really?
I'm not even sure your small effort would be really justified, let
alone my larger one.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 3:00 ` Eric S. Raymond
@ 2014-03-22 3:37 ` Paul Eggert
2014-03-22 3:42 ` Juanma Barranquero
2014-03-22 4:29 ` Eric S. Raymond
0 siblings, 2 replies; 38+ messages in thread
From: Paul Eggert @ 2014-03-22 3:37 UTC (permalink / raw
To: esr; +Cc: emacs-devel
Eric S. Raymond wrote:
> What I've
> done is treat the Bazaar ignore files as authoritative for those
> revisions during which Bazaar was in use, ignoring .gitignores during
> that period. The other major possibility would be to simply remove
> .bzrignores where .gitignore files exist.
Sorry, I'm not really following all that, as I haven't read the lift
script. Still, it puzzles me that the result is a .gitignore that has
the wrong data in it, in the sense that it has an arch tag, something
that is clearly wrong since we went through and removed those. If we're
generating .gitignore files from .bzrignore files, and if the .bzrignore
file just before the bzr-to-git transition lacks an arch tag, why would
the .gitignore file after the transition have it? And if we're using
some other process to generate the .gitignore file, then how did it
manage to keep the arch tags even though we removed them?
How about if we fix the .bzrignore and .gitignore files to agree now, by
hand, so that this part of the bzr-to-git transition is a no-op?
> But how much do we care about fewer than 108 overlong lines, really?
> I'm not even sure your small effort would be really justified, let
> alone my larger one.
I know some people care about readable ChangeLog entries. We edit them
even years after they were written to fix typos, for example. It's
worth the small effort, though not the larger one.
I wrote earlier that these changes could be made to the bzr trunk now,
but since they're so small and niggling we might as well make them to
the emacs-24 branch.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 3:37 ` Paul Eggert
@ 2014-03-22 3:42 ` Juanma Barranquero
2014-03-22 4:29 ` Eric S. Raymond
1 sibling, 0 replies; 38+ messages in thread
From: Juanma Barranquero @ 2014-03-22 3:42 UTC (permalink / raw
To: Paul Eggert; +Cc: Eric Raymond, Emacs developers
On Sat, Mar 22, 2014 at 4:37 AM, Paul Eggert <eggert@cs.ucla.edu> wrote:
> I know some people care about readable ChangeLog entries. We edit them even
> years after they were written to fix typos, for example.
<ahem> You don't say!
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 3:37 ` Paul Eggert
2014-03-22 3:42 ` Juanma Barranquero
@ 2014-03-22 4:29 ` Eric S. Raymond
2014-03-22 14:56 ` Paul Eggert
1 sibling, 1 reply; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-22 4:29 UTC (permalink / raw
To: Paul Eggert; +Cc: emacs-devel
Paul Eggert <eggert@cs.ucla.edu>:
> Eric S. Raymond wrote:
> >What I've
> >done is treat the Bazaar ignore files as authoritative for those
> >revisions during which Bazaar was in use, ignoring .gitignores during
> >that period. The other major possibility would be to simply remove
> >.bzrignores where .gitignore files exist.
>
> Sorry, I'm not really following all that, as I haven't read the lift
> script. Still, it puzzles me that the result is a .gitignore that
> has the wrong data in it, in the sense that it has an arch tag,
> something that is clearly wrong since we went through and removed
> those. If we're generating .gitignore files from .bzrignore files,
> and if the .bzrignore file just before the bzr-to-git transition
> lacks an arch tag, why would the .gitignore file after the
> transition have it? And if we're using some other process to
> generate the .gitignore file, then how did it manage to keep the
> arch tags even though we removed them?
I don't know. Maybe we can figure it out together.
Let me explain in detail what is currently happening and why.
First, why: the conversion goal is to make the entire history
convenient for git browsing - that is, as though git had neen in use
all along.
For our purposes, the history has two sections: pre-bzr and post-bzr.
In the pre-bzr section it is pretty clear what to do, because .cvsignore
files are upward-compatible to .gitignores. So we just rename them.
Policy for the post-bzr-changeover section is a little trickier.
There are three kinds of relevant files in that section; leftover
.cvsignores (presumably never modified afther the switch to bzr),
.bzrignore files, and .gitignore files.
Simply discarding the .cvsignore revisions after that point makes sense.
The information in them is stale. Neither bzr nor git uses them. They're
just clutter.
It's also clear enough what to do when a revision has .bzrignres but no
.gitignores - syntax-translate the .bzrignores (which is trivial) and
rename them.
The issue is what to do when a revision has both .bzrignores and
.gitignores. The pfresent policy is to treat each .bzrignore with
a matching.gitignore as authoritative; that is, the .bzrignore
is translated and overwites the .gitignore.
The arch tag you're seeing must have been removed in .gitigores but not
in .bzrignores. Other than the (trivial) bar-to-git syntax change
I'm not messing with the data or trying to do anything clever.
#
# IGNORE FILES
#
# Remove every .cvsignore not older than when .gitignores were
# first added. Then rename all remaining (older) .cvsignores to
# corresponding .gitignore paths; the syntax is upward-compatible.
# The date marks the introduction of .gitignore files.
#
<2009-02-03T23:32:38Z>..$ expunge /\.cvsignore$/
path (.*)/\.cvsignore$ rename \1/.gitignore
#
# Then treat .bzrignore files as authoritative, after changing leading
# "./" to "/". (The only other syntax incompatibility is "RE:", which
# the Emacs repository never uses.) The date marks the introduction of
# .bzrignore files.
#
<2009-12-27T21:38:14Z>..$ expunge /\.gitignore$/
=B & [/\.bzrignore$/] filter --regex :^\./:/:
path (.*)/\.bzrignore$ rename \1/.gitignore
> How about if we fix the .bzrignore and .gitignore files to agree
> now, by hand, so that this part of the bzr-to-git transition is a
> no-op?
That might make sense after 24.4
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-21 20:00 Converted git repository available for review Eric S. Raymond
` (2 preceding siblings ...)
2014-03-22 1:00 ` Paul Eggert
@ 2014-03-22 4:41 ` Juanma Barranquero
2014-03-22 7:32 ` Stephen J. Turnbull
` (3 more replies)
2014-03-22 8:02 ` Andreas Schwab
4 siblings, 4 replies; 38+ messages in thread
From: Juanma Barranquero @ 2014-03-22 4:41 UTC (permalink / raw
To: Eric S. Raymond; +Cc: Emacs developers
> Clone from git@gitorious.org:emacs-transition/review1.git
After cloning, the repo's size is 12,26 GiB.
The Bazaar shared repo uses 453 MiB.
Why the difference?
J
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 4:41 ` Converted git repository available for review Juanma Barranquero
@ 2014-03-22 7:32 ` Stephen J. Turnbull
2014-03-22 7:38 ` David Kastrup
2014-03-22 7:35 ` Eli Zaretskii
` (2 subsequent siblings)
3 siblings, 1 reply; 38+ messages in thread
From: Stephen J. Turnbull @ 2014-03-22 7:32 UTC (permalink / raw
To: Juanma Barranquero; +Cc: Eric S. Raymond, Emacs developers
Juanma Barranquero writes:
> > Clone from git@gitorious.org:emacs-transition/review1.git
>
> After cloning, the repo's size is 12,26 GiB.
>
> The Bazaar shared repo uses 453 MiB.
>
> Why the difference?
git clone doesn't automatically pack the new repo for some reason.
There was a thread a while back (1-2 months) about the optimal command
to pack the repo, but apparently it takes an ungodly amount of memory
on Windows (at least).
No time to be more detailed, HTH
Steve
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 4:41 ` Converted git repository available for review Juanma Barranquero
2014-03-22 7:32 ` Stephen J. Turnbull
@ 2014-03-22 7:35 ` Eli Zaretskii
2014-03-22 11:48 ` Juanma Barranquero
2014-03-22 9:12 ` Eric S. Raymond
2014-03-22 9:40 ` Andreas Schwab
3 siblings, 1 reply; 38+ messages in thread
From: Eli Zaretskii @ 2014-03-22 7:35 UTC (permalink / raw
To: Juanma Barranquero; +Cc: esr, emacs-devel
> From: Juanma Barranquero <lekktu@gmail.com>
> Date: Sat, 22 Mar 2014 05:41:45 +0100
> Cc: Emacs developers <emacs-devel@gnu.org>
>
> > Clone from git@gitorious.org:emacs-transition/review1.git
>
> After cloning, the repo's size is 12,26 GiB.
>
> The Bazaar shared repo uses 453 MiB.
>
> Why the difference?
You need to repack the repo, see
http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00591.html
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 7:32 ` Stephen J. Turnbull
@ 2014-03-22 7:38 ` David Kastrup
0 siblings, 0 replies; 38+ messages in thread
From: David Kastrup @ 2014-03-22 7:38 UTC (permalink / raw
To: emacs-devel
"Stephen J. Turnbull" <stephen@xemacs.org> writes:
> Juanma Barranquero writes:
> > > Clone from git@gitorious.org:emacs-transition/review1.git
> >
> > After cloning, the repo's size is 12,26 GiB.
> >
> > The Bazaar shared repo uses 453 MiB.
> >
> > Why the difference?
>
> git clone doesn't automatically pack the new repo for some reason.
Because it would make sense to pack the upstream instead?
--
David Kastrup
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-21 20:00 Converted git repository available for review Eric S. Raymond
` (3 preceding siblings ...)
2014-03-22 4:41 ` Converted git repository available for review Juanma Barranquero
@ 2014-03-22 8:02 ` Andreas Schwab
2014-03-22 9:20 ` Eric S. Raymond
4 siblings, 1 reply; 38+ messages in thread
From: Andreas Schwab @ 2014-03-22 8:02 UTC (permalink / raw
To: Eric S. Raymond; +Cc: emacs-devel
esr@thyrsus.com (Eric S. Raymond) writes:
> git@gitorious.org:emacs-transition/emacs-transition.git
What about the other 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."
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 4:41 ` Converted git repository available for review Juanma Barranquero
2014-03-22 7:32 ` Stephen J. Turnbull
2014-03-22 7:35 ` Eli Zaretskii
@ 2014-03-22 9:12 ` Eric S. Raymond
2014-03-22 11:47 ` Juanma Barranquero
2014-03-22 9:40 ` Andreas Schwab
3 siblings, 1 reply; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-22 9:12 UTC (permalink / raw
To: Juanma Barranquero; +Cc: Emacs developers
Juanma Barranquero <lekktu@gmail.com>:
> > Clone from git@gitorious.org:emacs-transition/review1.git
>
> After cloning, the repo's size is 12,26 GiB.
>
> The Bazaar shared repo uses 453 MiB.
>
> Why the difference?
>
> J
Yikes. Rebuild from a stream file commonly produces large reposories before
git repack. This is extreme.
The repack operation obviously didn't work very well. I'll try some
different options.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 8:02 ` Andreas Schwab
@ 2014-03-22 9:20 ` Eric S. Raymond
2014-03-22 9:44 ` Andreas Schwab
0 siblings, 1 reply; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-22 9:20 UTC (permalink / raw
To: Andreas Schwab; +Cc: emacs-devel
Andreas Schwab <schwab@linux-m68k.org>:
> > git@gitorious.org:emacs-transition/emacs-transition.git
>
> What about the other branches?
That's the conversion machiery. You want this:
git@gitorious.org:emacs-transition/review1.git
for which the branch list is
concurrency
emacs-23
emacs-24
gtk-tabs
* master
old-branches/EMACS_21_1_RC
old-branches/EMACS_22_BASE
old-branches/EMACS_23_1_RC
old-branches/NewVC-fileset
old-branches/branch-5_8
old-branches/cedet-branch
old-branches/emacs-unicode
old-branches/emacs-unicode-2
old-branches/font-backend
old-branches/gerd_defvaralias
old-branches/gnus-5_10-branch
old-branches/imagemagick
old-branches/lexbind
old-branches/lexbind-new
old-branches/multi-tty
old-branches/pending
old-branches/profiler
old-branches/python
old-branches/rmail-mbox-branch
old-branches/unicode-xft
old-branches/window-pub
other-branches/Boehm-GC
other-branches/Boehm-versions
other-branches/DAVELOVE
other-branches/FLYSPELL
other-branches/ILYA
other-branches/VENDOR
other-branches/XFT_JHD_BRANCH
other-branches/custom_themes
other-branches/fx-branch
other-branches/gerd_0001
other-branches/gerd_big
other-branches/gerd_dbe
other-branches/gerd_int
other-branches/glibc-2_0_x
other-branches/miles-orphaned-changes
other-branches/old-bidi
other-branches/old-concurrency
other-branches/patches_21_0
other-branches/test2
other-branches/thomas-posix1996
other-branches/ttn-vms-21-2-stash
other-branches/ttn-vms-21-3-stash
pending
trunk
x-tabs
xwidget
Some of those branches should probably be garbage-collected.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 4:41 ` Converted git repository available for review Juanma Barranquero
` (2 preceding siblings ...)
2014-03-22 9:12 ` Eric S. Raymond
@ 2014-03-22 9:40 ` Andreas Schwab
3 siblings, 0 replies; 38+ messages in thread
From: Andreas Schwab @ 2014-03-22 9:40 UTC (permalink / raw
To: Juanma Barranquero; +Cc: Eric S. Raymond, Emacs developers
Juanma Barranquero <lekktu@gmail.com> writes:
>> Clone from git@gitorious.org:emacs-transition/review1.git
>
> After cloning, the repo's size is 12,26 GiB.
git gc --aggressive shrinks it to 192MB, but takes more than one hour of
cpu time.
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."
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 9:20 ` Eric S. Raymond
@ 2014-03-22 9:44 ` Andreas Schwab
2014-03-22 11:03 ` Eric S. Raymond
0 siblings, 1 reply; 38+ messages in thread
From: Andreas Schwab @ 2014-03-22 9:44 UTC (permalink / raw
To: esr; +Cc: emacs-devel
"Eric S. Raymond" <esr@thyrsus.com> writes:
> git@gitorious.org:emacs-transition/review1.git
That's what I meant, of course.
> for which the branch list is
$ git ls-remote
From git://gitorious.org/emacs-transition/review1
d245cfa59ae766ccdc819aa40ce8eb1553d0ea33 HEAD
d245cfa59ae766ccdc819aa40ce8eb1553d0ea33 refs/heads/master
(Did you mean "git push --mirror"?)
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."
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 9:44 ` Andreas Schwab
@ 2014-03-22 11:03 ` Eric S. Raymond
2014-03-24 22:33 ` James Cloos
0 siblings, 1 reply; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-22 11:03 UTC (permalink / raw
To: Andreas Schwab; +Cc: emacs-devel
Andreas Schwab <schwab@linux-m68k.org>:
> (Did you mean "git push --mirror"?)
Ooops. Running that now. It may take a while.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 9:12 ` Eric S. Raymond
@ 2014-03-22 11:47 ` Juanma Barranquero
0 siblings, 0 replies; 38+ messages in thread
From: Juanma Barranquero @ 2014-03-22 11:47 UTC (permalink / raw
To: Eric Raymond; +Cc: Emacs developers
On Sat, Mar 22, 2014 at 10:12 AM, Eric S. Raymond <esr@thyrsus.com> wrote:
> Yikes. Rebuild from a stream file commonly produces large reposories before
> git repack. This is extreme.
Well, yes. With a 10 Mb ASDL line, cloning it has taken a few hours
(for values of few > 4 or 5).
J
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 7:35 ` Eli Zaretskii
@ 2014-03-22 11:48 ` Juanma Barranquero
0 siblings, 0 replies; 38+ messages in thread
From: Juanma Barranquero @ 2014-03-22 11:48 UTC (permalink / raw
To: Eli Zaretskii; +Cc: Eric Raymond, Emacs developers
On Sat, Mar 22, 2014 at 8:35 AM, Eli Zaretskii <eliz@gnu.org> wrote:
> You need to repack the repo, see
>
> http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00591.html
Yes, I remember that thread. But it makes sense to repack it upstream,
doesn't it? Because if every developer has to download 12 GiB, that
seems... suboptimal.
J
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 4:29 ` Eric S. Raymond
@ 2014-03-22 14:56 ` Paul Eggert
2014-03-22 18:47 ` Eric S. Raymond
0 siblings, 1 reply; 38+ messages in thread
From: Paul Eggert @ 2014-03-22 14:56 UTC (permalink / raw
To: esr; +Cc: emacs-devel
Eric S. Raymond wrote:
> The arch tag you're seeing must have been removed in .gitigores but not
> in .bzrignores. Other than the (trivial) bar-to-git syntax change
> I'm not messing with the data or trying to do anything clever.
There are no arch tags in the trunk now, in either .gitignore or
.bzrignore files. So something must have gone wrong in the lift.
> The issue is what to do when a revision has both .bzrignores and
> .gitignores. The pfresent policy is to treat each .bzrignore with
> a matching.gitignore as authoritative; that is, the .bzrignore
> is translated and overwites the .gitignore.
The bzr trunk has just one .bzrignore, at the root; it also has one
.gitignore at the root and 12 other .gitignore files scattered all over
the place. (I don't know why.) From what you say, the git review1
should have the same pattern of files, with the old root .gitignore
replaced by the translated .bzrignore (though I don't know why we should
keep the .bzrignore -- shouldn't it be removed?). However, the git
review1 has 38 .gitignore files (counting the one at the root). Where
did they come from?
Plus, the git review1 is missing some .gitignore files that are in the
trunk, namely lisp/cedet/.gitignore, lisp/leim/.gitignore,
lisp/leim/quail/.gitignore. Why is that happening?
Perhaps rather than delve into this too much, how about a different
idea. Currently people are using both bzr and git to access Emacs
repositories, so they've tuned the .bzrignore and .gitignore files to
match what they want from the different repository backends. So why not
leave these files alone? When we switch from bzr+git to just git, we
can remove the .bzrignore file. This would be simpler than rewriting
history, would be easier for everybody to understand, and would be less
likely to go wrong.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 14:56 ` Paul Eggert
@ 2014-03-22 18:47 ` Eric S. Raymond
2014-03-24 9:24 ` .gitignore and .bzrignore files Nicolas Richard
0 siblings, 1 reply; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-22 18:47 UTC (permalink / raw
To: Paul Eggert; +Cc: emacs-devel
Paul Eggert <eggert@cs.ucla.edu>:
> Perhaps rather than delve into this too much, how about a different
> idea. Currently people are using both bzr and git to access Emacs
> repositories, so they've tuned the .bzrignore and .gitignore files
> to match what they want from the different repository backends. So
> why not leave these files alone? When we switch from bzr+git to
> just git, we can remove the .bzrignore file. This would be simpler
> than rewriting history, would be easier for everybody to understand,
> and would be less likely to go wrong.
Easy enough to do, but with one possible cost. We might not get a happy
resuly for revisions that have *only* .bzrignore files, that is before
.gitignire files were added.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: .gitignore and .bzrignore files.
2014-03-22 18:47 ` Eric S. Raymond
@ 2014-03-24 9:24 ` Nicolas Richard
2014-03-24 10:38 ` Eric S. Raymond
2014-03-24 22:44 ` Achim Gratz
0 siblings, 2 replies; 38+ messages in thread
From: Nicolas Richard @ 2014-03-24 9:24 UTC (permalink / raw
To: Eric S. Raymond; +Cc: Paul Eggert, emacs-devel
"Eric S. Raymond" <esr@thyrsus.com> writes:
> Paul Eggert <eggert@cs.ucla.edu>:
>> Perhaps rather than delve into this too much, how about a different
>> idea. Currently people are using both bzr and git to access Emacs
>> repositories, so they've tuned the .bzrignore and .gitignore files
>> to match what they want from the different repository backends. So
>> why not leave these files alone? When we switch from bzr+git to
>> just git, we can remove the .bzrignore file. This would be simpler
>> than rewriting history, would be easier for everybody to understand,
>> and would be less likely to go wrong.
>
> Easy enough to do, but with one possible cost. We might not get a happy
> resuly for revisions that have *only* .bzrignore files, that is before
> .gitignire files were added.
I have one question : what goes in those ignore files ? I've heard some
people want to ignore files created during compilation, while some other
don't because they compile off tree and want to know if files get added
in the tree.
Related to this, is the fact that bzr ignores some files automatically:
$ bzr ignore --default-rules
*.a
*.o
*.py[co]
*.so
*.sw[nop]
*~
.#*
[#]*#
__pycache__
bzr-orphans
while git does not AFAIK (except those files/directories named '.git'.)
Should the .bzr->.git transition automatically add these to the
.gitignore file ?
--
Nico.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: .gitignore and .bzrignore files.
2014-03-24 9:24 ` .gitignore and .bzrignore files Nicolas Richard
@ 2014-03-24 10:38 ` Eric S. Raymond
2014-03-24 11:53 ` Stephen J. Turnbull
2014-03-24 15:54 ` Nicolas Richard
2014-03-24 22:44 ` Achim Gratz
1 sibling, 2 replies; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-24 10:38 UTC (permalink / raw
To: Nicolas Richard; +Cc: Paul Eggert, emacs-devel
Nicolas Richard <theonewiththeevillook@yahoo.fr>:
> I have one question : what goes in those ignore files ? I've heard some
> people want to ignore files created during compilation, while some other
> don't because they compile off tree and want to know if files get added
> in the tree.
I don't see how not excluding (for example) .o files would help with this.
> Related to this, is the fact that bzr ignores some files automatically:
> $ bzr ignore --default-rules
> *.a
> *.o
> *.py[co]
> *.so
> *.sw[nop]
> *~
> .#*
> [#]*#
> __pycache__
> bzr-orphans
Thank you, that is information I did not have.
> Should the .bzr->.git transition automatically add these to the
> .gitignore file ?
When the .gitignore is directly translated from a .bzrignore, these
should be prepended in order to correctly emulate the behavior of the
.bzrignore file.
Paul Eggert is proposing that we not do this at all and simply drop the
.bzrignore files from the history, trusting the .gitignore files already
in place to pick up the slack.
Shortly I will post to the list about the complications implied by various
ways of handling ignore files. Determining the right thing is not at all
simple.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: .gitignore and .bzrignore files.
2014-03-24 10:38 ` Eric S. Raymond
@ 2014-03-24 11:53 ` Stephen J. Turnbull
2014-03-24 15:54 ` Nicolas Richard
1 sibling, 0 replies; 38+ messages in thread
From: Stephen J. Turnbull @ 2014-03-24 11:53 UTC (permalink / raw
To: esr; +Cc: Nicolas Richard, Paul Eggert, emacs-devel
Eric S. Raymond writes:
> Nicolas Richard <theonewiththeevillook@yahoo.fr>:
> > I have one question : what goes in those ignore files ? I've
> > heard some people want to ignore files created during
> > compilation, while some other don't because they compile off tree
> > and want to know if files get added in the tree.
This is a tough question. However, all of the VCSes I know of provide
both cascading ignores (so that you can ignore the backup and lock
files your editor produces in a personal .ignore, and ignore the .o
produced by a C compiler in a C project and the .pyc files produced by
Python), and some way to clean up and list files that are ignored as
well as unregistered files that aren't ignored.
> Shortly I will post to the list about the complications implied by
> various ways of handling ignore files. Determining the right thing
> is not at all simple.
I'd say do what's simplest. I don't see why one can't live with a
pretty coarse approximation for a while.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: .gitignore and .bzrignore files.
2014-03-24 10:38 ` Eric S. Raymond
2014-03-24 11:53 ` Stephen J. Turnbull
@ 2014-03-24 15:54 ` Nicolas Richard
1 sibling, 0 replies; 38+ messages in thread
From: Nicolas Richard @ 2014-03-24 15:54 UTC (permalink / raw
To: Eric S. Raymond; +Cc: Nicolas Richard, Paul Eggert, emacs-devel
"Eric S. Raymond" <esr@thyrsus.com> writes:
> Nicolas Richard <theonewiththeevillook@yahoo.fr>:
>> I have one question : what goes in those ignore files ? I've heard some
>> people want to ignore files created during compilation, while some other
>> don't because they compile off tree and want to know if files get added
>> in the tree.
>
> I don't see how not excluding (for example) .o files would help with this.
When you compile off tree and an .o file is added in the tree, it's a
problem that should be detected. Ignoring those files would only hide
the problem. Note that I don't in fact do that, I was just reporting on
what I have heard/read elsewhere.
--
Nico.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-22 11:03 ` Eric S. Raymond
@ 2014-03-24 22:33 ` James Cloos
2014-03-24 22:39 ` Eric S. Raymond
0 siblings, 1 reply; 38+ messages in thread
From: James Cloos @ 2014-03-24 22:33 UTC (permalink / raw
To: Eric S. Raymond; +Cc: Andreas Schwab, emacs-devel
>>>>> "ESR" == Eric S Raymond <esr@thyrsus.com> writes:
ESR> Andreas Schwab <schwab@linux-m68k.org>:
>> (Did you mean "git push --mirror"?)
ESR> Ooops. Running that now. It may take a while.
A git gc --aggressive shrinks the repo from 12G to 200M; it would be
welcome to do that before pushing to gitorious.
-JimC
--
James Cloos <cloos@jhcloos.com> OpenPGP: 1024D/ED7DAEA6
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-24 22:33 ` James Cloos
@ 2014-03-24 22:39 ` Eric S. Raymond
2014-03-25 7:57 ` David Kastrup
0 siblings, 1 reply; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-24 22:39 UTC (permalink / raw
To: James Cloos; +Cc: Andreas Schwab, emacs-devel
James Cloos <cloos@jhcloos.com>:
> A git gc --aggressive shrinks the repo from 12G to 200M; it would be
> welcome to do that before pushing to gitorious.
I'll do that on the next iteration.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: .gitignore and .bzrignore files.
2014-03-24 9:24 ` .gitignore and .bzrignore files Nicolas Richard
2014-03-24 10:38 ` Eric S. Raymond
@ 2014-03-24 22:44 ` Achim Gratz
1 sibling, 0 replies; 38+ messages in thread
From: Achim Gratz @ 2014-03-24 22:44 UTC (permalink / raw
To: emacs-devel
Nicolas Richard writes:
> I have one question : what goes in those ignore files ? I've heard some
> people want to ignore files created during compilation, while some other
> don't because they compile off tree and want to know if files get added
> in the tree.
Since it's close to impossible to cater to both in-tree and out-of-tree
builds, you'll either end up with no .gitignore files in the repo at all
or adding them and having those files ignored. Given that
git clean -xn
will show you even those files that you ignore (and other VCS have their
own variant of the same), it may be slightly easier to just keep the
.gitignore files in the tree.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
Waldorf MIDI Implementation & additional documentation:
http://Synth.Stromeko.net/Downloads.html#WaldorfDocs
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-24 22:39 ` Eric S. Raymond
@ 2014-03-25 7:57 ` David Kastrup
2014-03-25 10:54 ` Eric S. Raymond
0 siblings, 1 reply; 38+ messages in thread
From: David Kastrup @ 2014-03-25 7:57 UTC (permalink / raw
To: emacs-devel
"Eric S. Raymond" <esr@thyrsus.com> writes:
> James Cloos <cloos@jhcloos.com>:
>> A git gc --aggressive shrinks the repo from 12G to 200M; it would be
>> welcome to do that before pushing to gitorious.
>
> I'll do that on the next iteration.
Sure that it will have an effect at all then? All the references will
already be there.
--
David Kastrup
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-25 7:57 ` David Kastrup
@ 2014-03-25 10:54 ` Eric S. Raymond
2014-03-25 11:04 ` David Kastrup
0 siblings, 1 reply; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-25 10:54 UTC (permalink / raw
To: David Kastrup; +Cc: emacs-devel
David Kastrup <dak@gnu.org>:
> "Eric S. Raymond" <esr@thyrsus.com> writes:
>
> > James Cloos <cloos@jhcloos.com>:
> >> A git gc --aggressive shrinks the repo from 12G to 200M; it would be
> >> welcome to do that before pushing to gitorious.
> >
> > I'll do that on the next iteration.
>
> Sure that it will have an effect at all then? All the references will
> already be there.
gc does some repacking and compression, not just garbage collection per se.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-25 10:54 ` Eric S. Raymond
@ 2014-03-25 11:04 ` David Kastrup
2014-03-25 11:32 ` Eric S. Raymond
2014-03-25 12:47 ` Phillip Lord
0 siblings, 2 replies; 38+ messages in thread
From: David Kastrup @ 2014-03-25 11:04 UTC (permalink / raw
To: Eric S. Raymond; +Cc: emacs-devel
"Eric S. Raymond" <esr@thyrsus.com> writes:
> David Kastrup <dak@gnu.org>:
>> "Eric S. Raymond" <esr@thyrsus.com> writes:
>>
>> > James Cloos <cloos@jhcloos.com>:
>> >> A git gc --aggressive shrinks the repo from 12G to 200M; it would be
>> >> welcome to do that before pushing to gitorious.
>> >
>> > I'll do that on the next iteration.
>>
>> Sure that it will have an effect at all then? All the references will
>> already be there.
>
> gc does some repacking and compression, not just garbage collection per se.
Sure, but why should any of that end up on gitorious if gitorious
already has all the references from the last time you pushed?
--
David Kastrup
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-25 11:04 ` David Kastrup
@ 2014-03-25 11:32 ` Eric S. Raymond
2014-03-25 11:39 ` David Kastrup
2014-03-25 12:47 ` Phillip Lord
1 sibling, 1 reply; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-25 11:32 UTC (permalink / raw
To: David Kastrup; +Cc: emacs-devel
David Kastrup <dak@gnu.org>:
> Sure, but why should any of that end up on gitorious if gitorious
> already has all the references from the last time you pushed?
The review1 repo has only had one push.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-25 11:32 ` Eric S. Raymond
@ 2014-03-25 11:39 ` David Kastrup
2014-03-25 11:50 ` Eric S. Raymond
0 siblings, 1 reply; 38+ messages in thread
From: David Kastrup @ 2014-03-25 11:39 UTC (permalink / raw
To: Eric S. Raymond; +Cc: emacs-devel
"Eric S. Raymond" <esr@thyrsus.com> writes:
> David Kastrup <dak@gnu.org>:
>> Sure, but why should any of that end up on gitorious if gitorious
>> already has all the references from the last time you pushed?
>
> The review1 repo has only had one push.
If the sole difference before the next push is a git gc --aggressive, it
still won't have a reason to fetch anything.
If you did a whole history rewrite invalidating all previous references,
things will be different. Though then there is not all that much
incentive to using the same repository.
--
David Kastrup
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-25 11:39 ` David Kastrup
@ 2014-03-25 11:50 ` Eric S. Raymond
0 siblings, 0 replies; 38+ messages in thread
From: Eric S. Raymond @ 2014-03-25 11:50 UTC (permalink / raw
To: David Kastrup; +Cc: emacs-devel
David Kastrup <dak@gnu.org>:
> > The review1 repo has only had one push.
>
> If the sole difference before the next push is a git gc --aggressive, it
> still won't have a reason to fetch anything.
>
> If you did a whole history rewrite invalidating all previous references,
> things will be different. Though then there is not all that much
> incentive to using the same repository.
That's likely to be nearly the case, since I'm going to tryt a different set
of transformations for ignore files after Paul Eggert's feedback.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-25 11:04 ` David Kastrup
2014-03-25 11:32 ` Eric S. Raymond
@ 2014-03-25 12:47 ` Phillip Lord
2014-03-25 13:04 ` David Kastrup
1 sibling, 1 reply; 38+ messages in thread
From: Phillip Lord @ 2014-03-25 12:47 UTC (permalink / raw
To: David Kastrup; +Cc: Eric S. Raymond, emacs-devel
David Kastrup <dak@gnu.org> writes:
> "Eric S. Raymond" <esr@thyrsus.com> writes:
>>
>> gc does some repacking and compression, not just garbage collection per se.
>
> Sure, but why should any of that end up on gitorious if gitorious
> already has all the references from the last time you pushed?
Probably it would be easier to just try it and see. CPUs are
generally cheaper to run than brains.
Phil
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: Converted git repository available for review
2014-03-25 12:47 ` Phillip Lord
@ 2014-03-25 13:04 ` David Kastrup
0 siblings, 0 replies; 38+ messages in thread
From: David Kastrup @ 2014-03-25 13:04 UTC (permalink / raw
To: Phillip Lord; +Cc: Eric S. Raymond, emacs-devel
phillip.lord@newcastle.ac.uk (Phillip Lord) writes:
> David Kastrup <dak@gnu.org> writes:
>
>> "Eric S. Raymond" <esr@thyrsus.com> writes:
>>>
>>> gc does some repacking and compression, not just garbage collection per se.
>>
>> Sure, but why should any of that end up on gitorious if gitorious
>> already has all the references from the last time you pushed?
>
>
> Probably it would be easier to just try it and see. CPUs are
> generally cheaper to run than brains.
Except that we are not talking CPU time here but rather network and
storage capacity. For an actual complete history rewrite, it might be
more polite to delete the existing repository and recreate it rather
than letting 16 Gigabyte per rewrite sit around at Gitorious for three
months until git gc finally cleans it up there.
--
David Kastrup
^ permalink raw reply [flat|nested] 38+ messages in thread
end of thread, other threads:[~2014-03-25 13:04 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-21 20:00 Converted git repository available for review Eric S. Raymond
2014-03-21 22:00 ` Stefan
2014-03-21 22:12 ` Eric S. Raymond
2014-03-21 22:06 ` Juanma Barranquero
2014-03-22 1:00 ` Paul Eggert
2014-03-22 3:00 ` Eric S. Raymond
2014-03-22 3:37 ` Paul Eggert
2014-03-22 3:42 ` Juanma Barranquero
2014-03-22 4:29 ` Eric S. Raymond
2014-03-22 14:56 ` Paul Eggert
2014-03-22 18:47 ` Eric S. Raymond
2014-03-24 9:24 ` .gitignore and .bzrignore files Nicolas Richard
2014-03-24 10:38 ` Eric S. Raymond
2014-03-24 11:53 ` Stephen J. Turnbull
2014-03-24 15:54 ` Nicolas Richard
2014-03-24 22:44 ` Achim Gratz
2014-03-22 4:41 ` Converted git repository available for review Juanma Barranquero
2014-03-22 7:32 ` Stephen J. Turnbull
2014-03-22 7:38 ` David Kastrup
2014-03-22 7:35 ` Eli Zaretskii
2014-03-22 11:48 ` Juanma Barranquero
2014-03-22 9:12 ` Eric S. Raymond
2014-03-22 11:47 ` Juanma Barranquero
2014-03-22 9:40 ` Andreas Schwab
2014-03-22 8:02 ` Andreas Schwab
2014-03-22 9:20 ` Eric S. Raymond
2014-03-22 9:44 ` Andreas Schwab
2014-03-22 11:03 ` Eric S. Raymond
2014-03-24 22:33 ` James Cloos
2014-03-24 22:39 ` Eric S. Raymond
2014-03-25 7:57 ` David Kastrup
2014-03-25 10:54 ` Eric S. Raymond
2014-03-25 11:04 ` David Kastrup
2014-03-25 11:32 ` Eric S. Raymond
2014-03-25 11:39 ` David Kastrup
2014-03-25 11:50 ` Eric S. Raymond
2014-03-25 12:47 ` Phillip Lord
2014-03-25 13:04 ` David Kastrup
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.