8:52 p.m.
xemacs-cvs(a)xemacs.org writes:
User: stephent
Date: 05/11/29 18:04:24
Modified: xemacs/modules ChangeLog
Log:
Undo inadvertant release commits.
Revision Changes Path
1.1360 +4 -4 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1359
retrieving revision 1.1360
diff -u -p -r1.1359 -r1.1360
--- version.sh 2005/11/29 14:41:17 1.1359
+++ version.sh 2005/11/29 17:04:05 1.1360
＠＠ -2,11 +2,11 ＠＠
emacs_is_beta=t
emacs_major_version=21
emacs_minor_version=5
-emacs_beta_version=24
-xemacs_codename="dandelion"
+emacs_beta_version=23
+xemacs_codename="daikon"
This one ain't pretty.
Malcolm, Steve, there's another one where Steve is undoing changes by
Malcolm.
I guess you both need to revisit today's commits.
Adrian
emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name=""
-xemacs_release_date="2005-11-29"
+xemacs_extra_name="(+CVS-20051128)"
+xemacs_release_date="2005-10-26"
1.479 +6 -2 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -p -r1.478 -r1.479
--- ChangeLog 2005/11/29 14:41:40 1.478
+++ ChangeLog 2005/11/29 17:04:05 1.479
＠＠ -1,6 +1,10 ＠＠
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+2005-11-29 Malcolm Purvis <malcolmp(a)xemacs.org>
- * XEmacs 21.5.24 "dandelion" is released.
+ * configure.ac (XE_PARSE_COMPLEX_OPTION): Correctly handle
+ --with-FOO[=yes]. Only enable defaults when the arg is
+ specified.
+ * configure.ac (XE_COMPLEX_ARG[xft]): Default everything on;
+ change doc.
2005-11-27 Marcus Crestani <crestani(a)xemacs.org>
1.67 +0 -4 XEmacs/xemacs/etc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- ChangeLog 2005/11/29 14:41:49 1.66
+++ ChangeLog 2005/11/29 17:04:10 1.67
＠＠ -1,7 +1,3 ＠＠
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.24 "dandelion" is released.
-
2005-11-18 Aidan Kehoe <kehoea(a)parhasard.net>
* HELLO: Add Irish, Tajik. Don't give the local name for the
1.202 +0 -4 XEmacs/xemacs/lib-src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- ChangeLog 2005/11/29 14:41:58 1.201
+++ ChangeLog 2005/11/29 17:04:11 1.202
＠＠ -1,7 +1,3 ＠＠
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.24 "dandelion" is released.
-
2005-11-22 Malcolm Purvis <malcolmp(a)xemacs.org>
* etags.c: Update to author version 17.15.
1.705 +2 -2 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.704
retrieving revision 1.705
diff -u -p -r1.704 -r1.705
--- ChangeLog 2005/11/29 14:52:44 1.704
+++ ChangeLog 2005/11/29 17:04:12 1.705
＠＠ -1,6 +1,6 ＠＠
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+2005-11-29 Malcolm Purvis <malcolmp(a)xemacs.org>
- * XEmacs 21.5.24 "dandelion" is released.
+ * occur.el: Add autoload cookie for list-matching-lines.
2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
1.78 +0 -4 XEmacs/xemacs/lwlib/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- ChangeLog 2005/11/29 14:52:55 1.77
+++ ChangeLog 2005/11/29 17:04:14 1.78
＠＠ -1,7 +1,3 ＠＠
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.24 "dandelion" is released.
-
2005-11-26 Stephen J. Turnbull <stephen(a)xemacs.org>
Merge Xft.
1.327 +0 -4 XEmacs/xemacs/man/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- ChangeLog 2005/11/29 14:53:04 1.326
+++ ChangeLog 2005/11/29 17:04:15 1.327
＠＠ -1,9 +1,5 ＠＠
2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
- * XEmacs 21.5.24 "dandelion" is released.
-
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
-
* xemacs/custom.texi (Faces): Describe some of the more important
font naming syntaxes under `set-face-font'. Fix a typo.
1.42 +0 -4 XEmacs/xemacs/netinstall/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- ChangeLog 2005/11/29 14:53:20 1.41
+++ ChangeLog 2005/11/29 17:04:16 1.42
＠＠ -1,7 +1,3 ＠＠
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.24 "dandelion" is released.
-
2005-11-22 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in:
1.196 +0 -4 XEmacs/xemacs/nt/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- ChangeLog 2005/11/29 14:53:28 1.195
+++ ChangeLog 2005/11/29 17:04:17 1.196
＠＠ -1,7 +1,3 ＠＠
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.24 "dandelion" is released.
-
2005-11-21 Marcus Crestani <crestani(a)xemacs.org>
Incremental Garbage Collector
1.28 +0 -4 XEmacs/xemacs/nt/installer/Wise/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/installer/Wise/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ChangeLog 2005/11/29 14:53:36 1.27
+++ ChangeLog 2005/11/29 17:04:18 1.28
＠＠ -1,7 +1,3 ＠＠
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.24 "dandelion" is released.
-
2005-10-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.23 "daikon" is released.
1.901 +0 -4 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.900
retrieving revision 1.901
diff -u -p -r1.900 -r1.901
--- ChangeLog 2005/11/29 14:53:52 1.900
+++ ChangeLog 2005/11/29 17:04:19 1.901
＠＠ -1,9 +1,5 ＠＠
2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
- * XEmacs 21.5.24 "dandelion" is released.
-
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
-
* xemacs.def.in.in (error_check_cons, error_check_ldap):
(error_check_opaque_ptr, error_check_pgconn, error_check_pgresult):
(error_check_string, wrap_record_1, XINT_1): Add. Patch by Rick
1.73 +0 -4 XEmacs/xemacs/tests/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- ChangeLog 2005/11/29 14:54:03 1.72
+++ ChangeLog 2005/11/29 17:04:23 1.73
＠＠ -1,7 +1,3 ＠＠
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.24 "dandelion" is released.
-
2005-10-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.23 "daikon" is released.
1.54 +0 -4 XEmacs/xemacs/modules/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- ChangeLog 2005/11/29 14:53:12 1.53
+++ ChangeLog 2005/11/29 17:04:24 1.54
＠＠ -1,7 +1,3 ＠＠
-2005-11-29 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.24 "dandelion" is released.
-
2005-11-22 Ben Wing <ben(a)xemacs.org>
* common/Makefile.common (mostlyclean):
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
12:39 a.m.
New subject: CVS update by stephent xemacs/modules ...
>>>> "APA" == Adrian Aichner
<adrian(a)xemacs.org> writes:
-emacs_beta_version=24
-xemacs_codename="dandelion"
+emacs_beta_version=23
+xemacs_codename="daikon"
APA> This one ain't pretty.
APA> Malcolm, Steve, there's another one where Steve is undoing
APA> changes by Malcolm.
APA> I guess you both need to revisit today's commits.
No, it's fine. Conflicts happen when you have an open process, that's
all. Malcolm's commit wedged my script's idea of process state, so I
unwound back to where stuff made sense and fixed my release config
stuff, then recommitted what needed committing. Everything is where
it should be now: Malcolm's log is in, the autoload cookie is in, the
logs claiming that a release has happened are out. The r21-5-24 tag
is inconsistent state, but since there's been no release announcement,
and it'll be reset in a couple days, I don't think it's going to hurt
anybody.
--
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
9:59 a.m.
New subject: CVS update by stephent xemacs/modules ...
>>>> "Stephen" == Stephen J Turnbull
<stephen(a)xemacs.org> writes:
Stephen> Everything is where it should be now: Malcolm's log is in, the
Stephen> autoload cookie is in, the logs claiming that a release has happened
Stephen> are out.
The only trouble is that I didn't commit the change to the top level
ChangeLog. How did it there?
(All but one of my sandboxes have read-only access to CVS to avoid accidental
changes to the repository. My read-write sandbox doesn't have this entry).
Malcolm
--
Malcolm Purvis <malcolmp(a)xemacs.org>
12:53 p.m.
New subject: CVS update by stephent xemacs/modules ...
>>>> "Malcolm" == Malcolm Purvis
<malcolmp(a)xemacs.org> writes:
Malcolm> The only trouble is that I didn't commit the change to
Malcolm> the top level ChangeLog. How did it there?
Uh, which change?
--
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
2:32 p.m.
New subject: CVS update by stephent xemacs/modules ...
>>>> "sjt" == Stephen J Turnbull
<stephen(a)xemacs.org> writes:
>>>> "Malcolm" == Malcolm Purvis
<malcolmp(a)xemacs.org> writes:
Malcolm> The only trouble is that I didn't commit the change to
Malcolm> the top level ChangeLog. How did it there?
sjt> Uh, which change?
Nevermind. I found it and backed it out.
God, I hate changelogs.
What happened is that I added the patch and changelog when I was
thinking about trying to get the release out immediately. I unpulled
the patch with darcs, but forgot the changelog. No, you don't want to
put code patches and changelogs in the same darcs patch---it's far too
easy to generate a conflict in a changelog, so it's best to keep them
separate.
I really like darcs, but this is a showstopper---I can't recommend
darcs for the XEmacs project yet.
--
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
5892
days inactive
5894
days old
4 comments
3 participants
participants (3)
-
Adrian Aichner -
Malcolm Purvis -
Stephen J. Turnbull