summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/Tools/tlrebuild8
1 files changed, 6 insertions, 2 deletions
diff --git a/Master/Tools/tlrebuild b/Master/Tools/tlrebuild
index 4bb9e52a93e..cf1167030b7 100755
--- a/Master/Tools/tlrebuild
+++ b/Master/Tools/tlrebuild
@@ -63,10 +63,14 @@ for dir in texmf/tpm texmf-dist/tpm texmf-doc/tpm; do
cd $master/$dir || exit 1
message "$dir: finding changed tpms"
for f in "$@"; do
- diff="`svn --diff-cmd=diff -x -u0 diff $f \
- | egrep -v '^[-+=@]{2,3}|TPM:Date|Index' 2>/dev/null`"
+ diff="`svn --diff-cmd=diff -x -u0 diff $f`"
+ diff_without_date=`echo "$diff" | egrep -v '^[-+=@]{2,3}|TPM:Date|^Index'`
if test -z "$diff"; then
svn revert $f
+ elif test -z "$diff_without_date"; then
+ # checking to see if this ever happens; the date should be stable?
+ echo "$f diff only in date, reverted: $diff"
+ svn revert $f
else
echo " $f diff:"
echo "$diff"