diff options
| -rwxr-xr-x | mailimport | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mailimport b/mailimport index e6e4df411..318d08aad 100755 --- a/mailimport +++ b/mailimport @@ -86,8 +86,6 @@ apply_patch () { fi done - make whitespace - committer=`grep "Committer:" $TMP2|sed s/"#Committer: "//` if [ "$usemq" != "" ]; then @@ -110,9 +108,12 @@ apply_patch () { echo hg -m "`cat $TMP2|grep -v "^#"`" qnew $name hg qnew -m "`cat $TMP2|grep -v "^#"`" $name + make whitespace hg qrefresh else patch -s -t -p1 -l -N -d $pdir -i $next + make whitespace + if [ "$?" != "0" ]; then echo "*** ERROR at: patch -s -t -p1 -l -N -d $pdir -i $next" exit |