Mercurial > hg
view hgeditor @ 232:fc4a6e5b5812
hg resolve: merge a given node into the working directory
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg resolve: merge a given node into the working directory
This is the first pass at working directory-based merges. Doing a
resolve adds a second parent to the working directory state for the
next commit.
manifest hash: 827b19995dd2d7686286da3b62c7d5fe3e0bc48c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMSHywK+sNU5EO8RAnOkAJsHH9jviMJcQJ4JurFuSlrbIwKqRACdHgNC
kkfoAxX2E5jkuOeSJ1Hjalk=
=bdrT
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 12:58:47 -0800 |
parents | 9a2075c0b9b8 |
children | a69c3b2957d1 |
line wrap: on
line source
#!/bin/bash # # This is an example of using HGEDITOR to automate the signing of # commits and so on. MANIFEST=`grep '^HG: manifest hash' $1 | cut -b 19-` if grep -q "^HG: merge resolve" $1 ; then # we don't sign merges $EDITOR $1 else T=`mktemp` CHANGED=`grep '^HG: changed' $1 | cut -b 13-` # show a diff so writing commit comments is easier hg diff $CHANGED >> $T echo -e "\n\nmanifest hash: $MANIFEST" > $1 emacs -nw $T $1 head -1 $1 > $T echo >> $T gpg -a -u $HGUSER -o - --clearsign $1 >> $T mv $T $1 fi