Mercurial > emacs

annotate move-if-change @ 111679:33ed3cf8260b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Initial support for unified DVCS pull and merge. * lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars. (vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull) (vc-bzr-merge-branch): New functions, implementing merge-branch and pull operations. * lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available. Accept optional prefix arg meaning to prompt for a command. (vc-update): Use vc-BACKEND-pull if available. Accept optional prefix arg meaning to prompt for a command. (vc-pull): Alias for vc-update.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 22 Nov 2010 20:15:08 -0500
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