annotate admin/make-changelog-diff @ 110898:069deed4cdec

Merge changes made in Gnus trunk. nnimap.el (nnimap-open-connection): If we have gnutls loaded, then try to use that for the tls stream. nnimap.el (nnimap-retrieve-group-data-early): Rework the marks code to heed UIDVALIDITY and find out which groups are read-only and not. nnimap.el (nnimap-get-flags): Use the same marks parsing code as the rest of nnimap. nnimap.el (nnmail-expiry-target-group): Say that every expiry target group is the "last". nnir.el (nnir-engines): Fix too many arguments. nnimap.el: Start implementing QRESYNC support. gnus.el (gnus-group-set-parameter): Fix typo. shr.el: Rework the way things are indented by <li> slightly. spam.el (gnus-summary-mode-map): Bind to "$".
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 10 Oct 2010 00:15:21 +0000
parents 3e136d0943a4
children 52a7f3f50b89 ef719132ddfa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
49682
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
1 #! /bin/bash
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
2
75649
3e136d0943a4 Add author.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
3 ## Author: Francesco Potorti` <pot@gnu.org>
3e136d0943a4 Add author.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
4
49682
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
5 if [ $# -ne 2 ]; then
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
6 echo "usage: $0 TAG1 TAG2" >&2
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
7 exit 1
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
8 fi
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
9
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
10 if [ ! -f INSTALL -o ! -f configure -o ! -d lib-src ]; then
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
11 echo "this script should be run in the emacs root directory" >&2
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
12 exit 2
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
13 fi
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
14
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
15 cvs -q diff -b -r $1 -r $2 $(find -name ChangeLog|sort) |
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
16 sed -n -e 's/^=\+/======/p' -e 's/^> //p' -e 's/^diff.*//p' \
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
17 -e 's/^RCS file: .cvsroot.emacs.emacs.\(.*\),v/\1/p' |
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
18 sed -n -e "/^======$/ {
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
19 N
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
20 N
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
21 h
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
22 d
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
23 }
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
24 H
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
25 s/.*//
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
26 x
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
27 s/^\n//
7acb008e4f73 make-changelog-diff REL1 REL2
Francesco Potortì <pot@gnu.org>
parents:
diff changeset
28 p"
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49682
diff changeset
29
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49682
diff changeset
30 # arch-tag: 7604a259-40b4-4f97-86b2-496a9c546f0a