merge should-not-be-a-branch to default. ENSURE YOUR LOCAL REPOSITORY IS IN THE default BRANCH
from cubicweb import CW_MIGRATION_MAP
for pk, in rql('Any K WHERE X is EProperty, X pkey IN (%s), X pkey K'
% ','.join("'system.version.%s'" % cube for cube in CW_MIGRATION_MAP),
ask_confirm=False):
cube = pk.split('.')[-1]
newk = pk.replace(cube, CW_MIGRATION_MAP[cube])
rql('SET X pkey %(newk)s WHERE X pkey %(oldk)s',
{'oldk': pk, 'newk': newk}, ask_confirm=False)
print 'renamed', pk, 'to', newk
add_entity_type('ECache')