reportecho "$o"
}
for d in $repos; do
+ case "$d" in
+ fteqcc)
+ # sorry, fteqcc repo is managed manually
+ continue
+ ;;
+ esac
enter "$d0/$d" verbose
base="`repobranch "$d"`"
reportecho "In $d:"
# apply crlf, or other cleanup filters (non-behavioural changes)
git reset --hard
find . -type f -exec touch {} \;
- git commit -a --amend -c HEAD
+ git commit -a --amend -C HEAD || true # don't fail if nothing to commit
echo "MERGING"
case ",`repoflags "$d"`," in