Mercurial > emacs
view admin/diff-tar-files @ 80801:d823156fd547
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (base, patch 1-2)
- tag of emacs@sv.gnu.org/emacs--devo--0--patch-709
- Sync to CVS tag EMACS_22_BRANCHPOINT
- Sync to CVS branch EMACS_22_BASE
2007-04-25 Richard Stallman <rms@gnu.org>
* lisp/hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'.
2007-04-24 Richard Stallman <rms@gnu.org>
* lispref/text.texi (Special Properties): Add xref to Overlay Properties.
* lispref/display.texi (Overlay Properties): Add xref to Special Properties.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-716
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 28 Apr 2007 03:47:01 +0000 |
parents | 3d45362f1d38 |
children | 450fa81c5930 95d0cdf160ea |
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 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