view admin/diff-tar-files @ 82251:b8c796068320

Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 84-87) - Update from CVS - Change capitalization of VC backend names for new backends 2007-08-02 Richard Stallman <rms@gnu.org> * lisp/mail/rmailsum.el (rmail-make-summary-line): Find end of msg number to update deleted flag. * lisp/cus-edit.el (customize-apropos, customize-apropos-options) (customize-apropos-faces, customize-apropos-groups): Improve prompt. * lisp/menu-bar.el (menu-bar-help-menu): Add "About GNU" menu item. * lisp/startup.el (fancy-splash-head, startup-echo-area-message): Change message text. * lisp/emulation/tpu-edt.el (next-line-internal): Setting deleted. All callers use line-move. * lisp/progmodes/compile.el (compilation-find-buffer): Return current buffer immediately if suitable. (compile, compilation-buffer-name, compilation-start): Doc fixes. 2007-07-31 Daiki Ueno <ueno@unixuser.org> * lisp/faces.el (face-normalize-spec): New function. (frame-set-background-mode): Normalize face-spec before calling face-spec-match-p. 2007-07-31 Stefan Monnier <monnier@iro.umontreal.ca> * lisp/server.el (server-window): Add switch-to-buffer-other-frame option. 2007-08-03 Richard Stallman <rms@gnu.org> * src/fileio.c (Fvisited_file_modtime): Use make_time. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-844
author Miles Bader <miles@gnu.org>
date Fri, 03 Aug 2007 05:49:59 +0000
parents 450fa81c5930
children cde444d03b82 f55f9811f5d7
line wrap: on
line source

#! /bin/sh

# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
#   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 3, 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