Mercurial > emacs
comparison lib-src/vcdiff @ 69559:130314bad206
Use "echo" as a default for $echo, otherwise we'll execute $DIFF
twice, and once with the wrong options.
author | André Spiegel <spiegel@gnu.org> |
---|---|
date | Sat, 18 Mar 2006 14:47:20 +0000 |
parents | 3661e9b3c48f |
children | 3d45362f1d38 b901f4f12f33 e3bacb89536a |
comparison
equal
deleted
inserted
replaced
69558:aed02e3a8c0f | 69559:130314bad206 |
---|---|
27 DIFF="diff" | 27 DIFF="diff" |
28 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." | 28 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." |
29 | 29 |
30 PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts | 30 PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts |
31 | 31 |
32 echo= | 32 echo="echo" |
33 sid1= sid2= | 33 sid1= sid2= |
34 | 34 |
35 for f | 35 for f |
36 do | 36 do |
37 case $f in | 37 case $f in |
94 rev2=/tmp/getb$$ | 94 rev2=/tmp/getb$$ |
95 get -s -p -k $sid2 "$f" > $rev2 | 95 get -s -p -k $sid2 "$f" > $rev2 |
96 workfile=$rev2 | 96 workfile=$rev2 |
97 esac | 97 esac |
98 then | 98 then |
99 $echo $DIFF $options $sid1 $sid2 $workfile >&2 | 99 $echo $DIFF $options $rev1 $workfile >&2 |
100 $DIFF $options $rev1 $workfile | 100 $DIFF $options $rev1 $workfile |
101 s=$? | 101 s=$? |
102 fi | 102 fi |
103 ;; | 103 ;; |
104 *) | 104 *) |