view admin/diff-tar-files @ 85478:786d3a985758

* term/x-win.el (x-gtk-stock-map, icon-map-list) (x-gtk-map-stock): Delete duplicated definitions from merge. * progmodes/octave-mod.el: Require octave-inf at compile time * progmodes/compile.el (compilation-skip-to-next-location) (compilation-skip-threshold, compilation-skip-visited): Move definitions earlier. * play/zone.el (zone-fall-through-ws): * play/landmark.el (lm-move-down, lm-move-up): * play/handwrite.el (handwrite): * mail/mspools.el (mspools-visit-spool): * wdired.el (wdired-next-line, wdired-previous-line): * tar-mode.el (tar-subfile-save-buffer): * scroll-lock.el (scroll-lock-next-line) (scroll-lock-previous-line): * image-dired.el (image-dired-next-line) (image-dired-previous-line): * ediff-help.el (ediff-help-message-line-length): Use forward-line. * smerge-mode.el (smerge-auto-refine): * diff-mode.el (diff-auto-refine): Add :group. * play/yow.el: Require doctor at compile time. * vmsproc.el: Provide vmsproc. (command-send-input): Use forward-line. * vms-patch.el: Require ps-print and vmsproc at compile time. * vc-mtn.el (log-view-message-re, log-view-file-re) (log-view-font-lock-keywords): Pacify byte-compiler. * vc-hg.el: Require log-view at compile time.

#! /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