diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-07-04 17:58:23 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-07-04 17:58:23 +0200 |
| commit | 8fbac88a9c801be025c283275f2eb6585a5cc454 (patch) | |
| tree | bd82f6b1848d218e56f57805fdc569b9574e8089 /mailimport | |
| parent | c0b0560a9ed6e97eca6da5f8432c0dbb2fe471ad (diff) | |
| parent | 54b507ede0a1c5349b47f84af7d3d0b417467e3a (diff) | |
| download | mediapointer-dvb-s2-8fbac88a9c801be025c283275f2eb6585a5cc454.tar.gz mediapointer-dvb-s2-8fbac88a9c801be025c283275f2eb6585a5cc454.tar.bz2 | |
sync with master
From: Patrick Boettcher <pb@linuxtv.org>
sync with master
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'mailimport')
| -rwxr-xr-x | mailimport | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mailimport b/mailimport index e6e4df411..2bcd2a09f 100755 --- a/mailimport +++ b/mailimport @@ -25,18 +25,18 @@ fi MBOX=$1 if [ "$TMPDIR" == "" ]; then - TMPDIR=/tmp + TMPDIR=/tmp fi if [ "$EDITOR" == "" ]; then - EDITOR=nano + EDITOR=nano fi DIR=$TMPDIR/mailimport$$ mkdir $DIR if [ "$?" != "0" ]; then - echo "*** Error at mkdir $DIR" - exit; + echo "*** Error at mkdir $DIR" + exit; fi trap "rm -rf $DIR" EXIT TMP2=$DIR/patchheader @@ -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 @@ -133,6 +134,7 @@ apply_patch () { fi cd $cur fi + hg log -r -1 -v } echo git-mailsplit $MBOX $DIR |