From f73d0e33c754934587c8ec8448897e4a49945948 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 15 Feb 2012 06:41:12 -0800 Subject: [PATCH] Small update to update_patches.bat, to skip patch reject files. --- forge/update_patches.bat | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/forge/update_patches.bat b/forge/update_patches.bat index 84fb4f655c..31b35b14ca 100644 --- a/forge/update_patches.bat +++ b/forge/update_patches.bat @@ -15,7 +15,11 @@ for /f %%i in ('find ../src_work -type f') do ( set file=%%i set file=!file:~11! rem echo !file! - diff -u ../src_base!file! ../src_work!file! -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -0000/" | tr -d '\r' > patches!file!.patch + if "!file:~-1!" NEQ "#" ( + if "!file:~-1!" NEQ "~" ( + diff -u ../src_base!file! ../src_work!file! -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -0000/" | tr -d '\r' > patches!file!.patch + ) + ) ) echo Removing empty patches