Mercurial > hg > mercurial-crew-with-dirclash
view hgeditor @ 407:0e0d0670b2bc
[PATCH] Merging identical changes from another branch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Merging identical changes from another branch
From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk>
The issue comes up when a local uncommitted *new* file (i.e. not in the
current manifest) is being merged with an identical file from a branch.
Since the file is not in the current manifest (it's either in the
current "to-be-added" list, or in the "unknown" state), there's no
(local) node from which to create a mergepoint.
manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01
92uuMswZXcoCchQAaxew7C0=
=qRsk
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 18:41:57 -0800 |
parents | b4e0e20646bb |
children | ab53998b9dcd 934279f3ca53 |
line wrap: on
line source
#!/bin/bash # # This is an example of using HGEDITOR to automate the signing of # commits and so on. T1=""; T2="" cleanup_exit() { rm -f "$T1" "$T2" exit $1 } case "${EDITOR:=vi}" in emacs) EDITOR="$EDITOR -nw" ;; gvim|vim) EDITOR="$EDITOR -f -o" ;; esac if grep -q "^HG: merge resolve" "$1" ; then # we don't sign merges exec $EDITOR "$1" else T1=`mktemp`; T2=`mktemp` MANIFEST=`grep '^HG: manifest hash' "$1" | cut -b 19-` echo -e "\n\nmanifest hash: $MANIFEST" >> "$T1" grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$T1" hg diff >> "$T2" CHECKSUM=`md5sum "$T1"` $EDITOR "$T1" "$T2" || cleanup_exit $? echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 0 { head -1 "$T1" echo grep -v "^HG:" "$T1" | gpg -a -u "${HGUSER:-$EMAIL}" --clearsign } > "$T2" && mv "$T2" "$1" cleanup_exit $? fi