annotate move-if-change @ 31538:46aca282e6b0

(diff-apply-hunk): Function basically rewritten. Now understands non-unified diffs. Some functionality moved into `diff-hunk-text' and `diff-find-text'. Add OTHER-FILE, DRY-RUN, POPUP, and NOERROR arguments. If DRY-RUN is true, don't actually modify anything. Only reposition point in the patched file if the patch succeeds. Only pop up another window if POPUP is true. Emit a message describing what happened if successful, and at what line-offset. Automatically detect reversed hunks and do something appropriate. (diff-hunk-text, diff-find-text): New functions. (diff-filter-lines): Function removed. (diff-test-hunk): New function. (diff-goto-source): Rewritten in terms of diff-apply-hunk.
author Miles Bader <miles@gnu.org>
date Mon, 11 Sep 2000 13:49:38 +0000
parents 354e0c45cedf
children 14a97ab281d5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25856
Dave Love <fx@gnu.org>
parents:
diff changeset
1 #!/bin/sh
Dave Love <fx@gnu.org>
parents:
diff changeset
2 if
Dave Love <fx@gnu.org>
parents:
diff changeset
3 test -r $2
Dave Love <fx@gnu.org>
parents:
diff changeset
4 then
Dave Love <fx@gnu.org>
parents:
diff changeset
5 if
Dave Love <fx@gnu.org>
parents:
diff changeset
6 cmp $1 $2 > /dev/null
Dave Love <fx@gnu.org>
parents:
diff changeset
7 then
Dave Love <fx@gnu.org>
parents:
diff changeset
8 echo $2 is unchanged
Dave Love <fx@gnu.org>
parents:
diff changeset
9 rm -f $1
Dave Love <fx@gnu.org>
parents:
diff changeset
10 else
Dave Love <fx@gnu.org>
parents:
diff changeset
11 mv -f $1 $2
Dave Love <fx@gnu.org>
parents:
diff changeset
12 fi
Dave Love <fx@gnu.org>
parents:
diff changeset
13 else
Dave Love <fx@gnu.org>
parents:
diff changeset
14 mv -f $1 $2
Dave Love <fx@gnu.org>
parents:
diff changeset
15 fi