[sr-dev] git:master:f92ca97a: diversion remove svn id