Index: alarmMapping.sh =================================================================== diff -u -raa7591d9f61f5d8d5a2b3604d4c37d6cea829700 -r108450c58851ff7c48c4607494b8cdae59952908 --- alarmMapping.sh (.../alarmMapping.sh) (revision aa7591d9f61f5d8d5a2b3604d4c37d6cea829700) +++ alarmMapping.sh (.../alarmMapping.sh) (revision 108450c58851ff7c48c4607494b8cdae59952908) @@ -18,6 +18,7 @@ echo "update the common repo" cd common if ( test -d .git ); then + git checkout staging git pull fi cd .. @@ -35,8 +36,8 @@ ../scripts/build/alarmMapping \ common/AlarmDefs.h \ sources/model/hd/alarm/MAlarmMapping.cpp \ - 1> alarmMapping.log \ - 2> alarmMapping.err + 2> alarmMapping.err \ + | tee alarmMapping.log echo "move the Alarm code mapping to current location(./)" mv ../scripts/build/AlarmMapping.csv .