--- a/mktag	Sun Mar 01 18:39:36 2009 +0100
+++ b/mktag	Sun Mar 01 18:42:00 2009 +0100
@@ -16,7 +16,6 @@
 id=$(hg id)
 id=${id%% *}
 
-id=${id%+}
 case "$id" in
 	*+)	echo "sorry, local version is modified." >&2
 		exit 1
@@ -31,7 +30,7 @@
 esac
 
 hg tag $o_force "$tag" \
-&& old=$(hg id) \
+&& old=$(hg id -i) \
 && hg up -r "$tag" \
 && make clean all \
 && hg up -r "$old"