diff tests/test-push-checkheads-superceed-A7.t @ 39591:aa022f8873ea

rebase: add tests showing patch conflict detection needs to be smarter in IMM This patch adds test which shows that you can't rebase a cset which removes a dir and adds a file of the same as that of dir as there are False positives path conflicts reported. I fixed the case when there is a file and we adds a dir of same name while removing the file, but missed testing the current case. Next patch will fix this. Differential Revision: https://phab.mercurial-scm.org/D4544
author Pulkit Goyal <pulkit@yandex-team.ru>
date Wed, 12 Sep 2018 17:22:46 +0300
parents 89630d0b3e23
children 34a46d48d24e
line wrap: on
line diff