##// END OF EJS Templates
rebase: add tests showing patch conflict detection needs to be smarter in IMM...
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
Pulkit Goyal -
r39611:aa022f88 default
Show More
Name Size Modified Last Commit Author
/ mercurial / thirdparty / concurrent / futures
__init__.py Loading ...
_base.py Loading ...
process.py Loading ...
thread.py Loading ...