Mercurial > hg > mercurial-crew-with-dirclash
annotate hgeditor @ 226:1536ccac47e9
merge: don't bail on outstanding changes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge: don't bail on outstanding changes
With multiple heads, we don't need to worry about the working dir's
uncommitted changes at pull time
manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy
CysB458dNcFuB/vDFhgJr58=
=gG+u
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 12:45:04 -0800 |
parents | 9a2075c0b9b8 |
children | a69c3b2957d1 |
rev | line source |
---|---|
186 | 1 #!/bin/bash |
2 # | |
3 # This is an example of using HGEDITOR to automate the signing of | |
4 # commits and so on. | |
5 | |
6 MANIFEST=`grep '^HG: manifest hash' $1 | cut -b 19-` | |
7 if grep -q "^HG: merge resolve" $1 ; then | |
8 # we don't sign merges | |
9 $EDITOR $1 | |
10 else | |
11 T=`mktemp` | |
12 CHANGED=`grep '^HG: changed' $1 | cut -b 13-` | |
13 # show a diff so writing commit comments is easier | |
14 hg diff $CHANGED >> $T | |
15 echo -e "\n\nmanifest hash: $MANIFEST" > $1 | |
16 emacs -nw $T $1 | |
17 head -1 $1 > $T | |
18 echo >> $T | |
19 gpg -a -u $HGUSER -o - --clearsign $1 >> $T | |
20 mv $T $1 | |
21 fi |