Merge Chris's script with the one already checked in

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2408 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-04-29 19:11:01 +00:00
parent e2cbbce6aa
commit 868cb7da08
2 changed files with 12 additions and 6 deletions

View File

@ -35,14 +35,17 @@ else
echo ""; echo "Not updating files."; echo ""
endif
echo ""; echo " UPDATE CONFLICTS OCCURRED FOR THE FOLLOWING FILES (OR NONE):"
echo ""; echo " FILES UPDATED:"
grep '^U' cvs.out
echo ""; echo " UPDATE CONFLICTS OCCURRED FOR THE FOLLOWING FILES:"
grep '^C' cvs.out
echo ""; echo " FILES SUCCESSFULLY MERGED:"
echo ""; echo " FILES SUCCESSFULLY MERGED (or locally modified):"
grep '^M' cvs.out | grep -v Merging
echo ""; echo " NEW FILES AND DIRECTORIES:"
grep '^\?' cvs.out | & grep -v '/De[bp]' | grep -v '\.bc' | grep -v /Release | grep -v Updating | grep -v cvsup | grep -v 'cvs.out' | grep -v gnumake.out | grep -v tools/as/as | grep -v tools/dis/dis | grep -v tools/opt/opt | grep -v tools/analyze/analyze
grep '^\?' cvs.out | & grep -v '\.bc' | grep -v Updating | grep -v cvsup | grep -v 'cvs.out' | grep -v gnumake.out | grep -v '\.mc$' | grep -v '\.s$' | grep -v '\.native'
echo ""

View File

@ -35,14 +35,17 @@ else
echo ""; echo "Not updating files."; echo ""
endif
echo ""; echo " UPDATE CONFLICTS OCCURRED FOR THE FOLLOWING FILES (OR NONE):"
echo ""; echo " FILES UPDATED:"
grep '^U' cvs.out
echo ""; echo " UPDATE CONFLICTS OCCURRED FOR THE FOLLOWING FILES:"
grep '^C' cvs.out
echo ""; echo " FILES SUCCESSFULLY MERGED:"
echo ""; echo " FILES SUCCESSFULLY MERGED (or locally modified):"
grep '^M' cvs.out | grep -v Merging
echo ""; echo " NEW FILES AND DIRECTORIES:"
grep '^\?' cvs.out | & grep -v '/De[bp]' | grep -v '\.bc' | grep -v /Release | grep -v Updating | grep -v cvsup | grep -v 'cvs.out' | grep -v gnumake.out | grep -v tools/as/as | grep -v tools/dis/dis | grep -v tools/opt/opt | grep -v tools/analyze/analyze
grep '^\?' cvs.out | & grep -v '\.bc' | grep -v Updating | grep -v cvsup | grep -v 'cvs.out' | grep -v gnumake.out | grep -v '\.mc$' | grep -v '\.s$' | grep -v '\.native'
echo ""