Mercurial > hg
view tests/test-absorb-phase.t @ 39575: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 | 5111d11b8719 |
children | 0b7594ada0db |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [extensions] > absorb= > drawdag=$RUNTESTDIR/drawdag.py > EOF $ hg init $ hg debugdrawdag <<'EOS' > C > | > B > | > A > EOS $ hg phase -r A --public -q $ hg phase -r C --secret --force -q $ hg update C -q $ printf B1 > B $ hg absorb -q $ hg log -G -T '{desc} {phase}' @ C secret | o B draft | o A public