Mercurial > hg > xemacs-beta

annotate move-if-change @ 2146:e4307a6b9ebb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-06-21 18:26:18 by adrian] [R21.4] [PATCH] xemacs-21.5: Fix false cvs conflict in lisp/package-ui.el -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2004-06-21 Adrian Aichner <adrian@xemacs.org> * package-ui.el (pui-help-echo): Fix false cvs conflict by avoiding line solely composed of equal signs.
author adrian
date Mon, 21 Jun 2004 18:26:18 +0000
parents 376386a54a3c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 #!/bin/sh
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 test -r $2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 cmp $1 $2 > /dev/null
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 echo $2 is unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 rm -f $1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 mv -f $1 $2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 mv -f $1 $2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 fi