t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify