Mercurial > emacs
view admin/diff-tar-files @ 72632:d69718b12697
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 129-130)
- Merge from emacs--devo--0
- Update from CVS
2006-09-04 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-gpg.el (pgg-gpg-process-region): Revert two patches from Satyaki
Das. http://article.gmane.org/gmane.emacs.gnus.general/49947
http://article.gmane.org/gmane.emacs.gnus.general/50457
2006-09-04 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-strip-backslashes-in-quoted-strings): Decode `\\'
in quoted string into `\'.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-421
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 04 Sep 2006 06:27:27 +0000 |
parents | a8b22f12b3dc |
children | ddcbd2c1b70d 72dea2ff0142 |
line wrap: on
line source
#! /bin/sh # Copyright (C) 2001, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # # GNU Emacs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # # GNU Emacs is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. if [ $# != 2 ]; then cat <<EOF Usage: $0 OLD-TAR NEW-TAR Print a diff of the files in OLD-TAR and NEW-TAR. Used for checking the contents of Emacs tar files. EOF exit 1; fi old_tar=$1 new_tar=$2 old_tmp=/tmp/old.$$ new_tmp=/tmp/new.$$ trap "rm -f $old_tmp $new_tmp; exit 1" 1 2 15 tar tzf $old_tar | sed -e 's,^[^/]*,,' | sort > $old_tmp tar tzf $new_tar | sed -e 's,^[^/]*,,' | sort > $new_tmp diff -u $old_tmp $new_tmp rm -f $new_tmp $old_tmp # arch-tag: ef2c96e2-ea67-4668-925c-d9a6f3d205cf