Mercurial > hg
view tests/test-issue1102.t @ 39131:02e80e37fbbc
tests: demonstrate that IMM needs to be smarter with path conflicts
When we try to rebase a commit which deletes an existing file and make a
directory of the same name, rebase with IMM aborts. It should work fine just
like the without IMM case.
Differential Revision: https://phab.mercurial-scm.org/D4299
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Thu, 16 Aug 2018 16:53:48 +0300 |
parents | 4591cd6b6794 |
children | 805419729e11 |
line wrap: on
line source
$ rm -rf a $ hg init a $ cd a $ echo a > a $ hg ci -Am0 adding a $ hg tag t1 # 1 $ hg tag --remove t1 # 2 $ hg co 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg tag -f -r0 t1 $ hg tags tip 3:a49829c4fc11 t1 0:f7b1eb17ad24 $ cd ..