Commit 345e31e1 authored by gejun's avatar gejun

list rej files after patching & add -l to patch

parent a45df223
......@@ -72,4 +72,11 @@ if [ -z "$DO_RUN" ]; then
EXTRA_ARGS="--dry-run $EXTRA_ARGS"
echo "*** This is a dry-run. To really apply, run: DO_RUN=1 tools/patch_from_svn $1"
fi
patch -p0 -u $EXTRA_ARGS < $MODIFIED_PATCHFILE
patch -p0 -u -l $EXTRA_ARGS < $MODIFIED_PATCHFILE
if [ ! -z "$DO_RUN" ]; then
REJ_FILES=`find . -name "*.rej"`
if [ ! -z "$REJ_FILES" ]; then
echo "==== The patching is not done yet! Apply following rej files manually ===="
echo $REJ_FILES
fi
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment