Mercurial > hg > mercurial-crew-with-dirclash
comparison hgeditor @ 484:934279f3ca53
Pull from TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Pull from TAH
manifest hash: 470ea90dd95189a019f4d96016a45db8a297b841
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvzZzywK+sNU5EO8RAkZhAKCUJKX1vFtkFxV7qFwbuWQj62zcnQCfU687
jxKpBVesIXSOpBO4NbW/RIM=
=hSBe
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sun, 26 Jun 2005 15:12:51 -0800 |
parents | b4e0e20646bb ab53998b9dcd |
children | 3d4d5f2aba9a 4fc63e22b1fe |
comparison
equal
deleted
inserted
replaced
474:b2ae8283d1a6 | 484:934279f3ca53 |
---|---|
25 T1=`mktemp`; T2=`mktemp` | 25 T1=`mktemp`; T2=`mktemp` |
26 MANIFEST=`grep '^HG: manifest hash' "$1" | cut -b 19-` | 26 MANIFEST=`grep '^HG: manifest hash' "$1" | cut -b 19-` |
27 | 27 |
28 echo -e "\n\nmanifest hash: $MANIFEST" >> "$T1" | 28 echo -e "\n\nmanifest hash: $MANIFEST" >> "$T1" |
29 grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$T1" | 29 grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$T1" |
30 hg diff >> "$T2" | 30 ( |
31 cd "`hg root`" | |
32 grep '^HG: changed' "$1" | cut -b 13- | while read changed; do | |
33 hg diff "$changed" >> "$T2" | |
34 done | |
35 ) | |
31 | 36 |
32 CHECKSUM=`md5sum "$T1"` | 37 CHECKSUM=`md5sum "$T1"` |
33 $EDITOR "$T1" "$T2" || cleanup_exit $? | 38 $EDITOR "$T1" "$T2" || cleanup_exit $? |
34 echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 0 | 39 echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 0 |
35 { | 40 { |