Mercurial > hg
diff hgmerge @ 1797:42f75cd04bf4
Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 23 Feb 2006 14:42:47 +0100 |
parents | ac7b91bcbd8d |
children | d610fe0e6893 |
line wrap: on
line diff
--- a/hgmerge Thu Feb 23 12:35:15 2006 +0100 +++ b/hgmerge Thu Feb 23 14:42:47 2006 +0100 @@ -45,7 +45,7 @@ RAND="$RANDOM$RANDOM" # temporary directory for diff+patch merge -HGTMP="${TMPDIR-'/tmp'}/hgmerge.$RAND" +HGTMP="${TMPDIR-/tmp}/hgmerge.$RAND" # backup file BACKUP="$LOCAL.orig.$RAND" @@ -74,10 +74,11 @@ # Ask if the merge was successful ask_if_merged() { - while 1; do - echo "$LOCAL seems unchanged. Was the merge successful? [y/n]" + while true; do + echo "$LOCAL seems unchanged." + echo "Was the merge successful? [y/n]" read answer - case answer in + case "$answer" in y*|Y*) success;; n*|N*) failure;; esac