Move app.yaml to app.yaml.template and add app.yaml to svn:ignore in trunk/app.
Each Google App Engine instance needs its own "application:" ID, and this
should *not* be committed into the SoC SVN repository in trunk/app. (Individual
deployment branches *will* have app.yaml files with Google App Engine
application IDs in them, just not trunk/app.)
indexes:
# AUTOGENERATED
# This index.yaml is automatically updated whenever the dev_appserver
# detects that a new type of query is run. If you want to manage the
# index.yaml file manually, remove the above marker line (the line
# saying "# AUTOGENERATED"). If you want to manage some indexes
# manually, move them above the marker line. The index.yaml file is
# automatically uploaded to the admin console when you next deploy
# your application using appcfg.py.