I have faced this related issue. But what about building additional subtasks if father or mother story will get moved to following sprint? For eg., possessing two 'Implementation' subtasks could be typical but make sure their Repair version differs (inside our case a dash is actually a new version. So this might not do the job for all). In essence