view tests/test-revlog-group-emptyiter.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 f2719b387380
children
line wrap: on
line source

Issue1678: IndexError when pushing

setting up base repo
  $ hg init a
  $ cd a
  $ touch a
  $ hg ci -Am a
  adding a
  $ cd ..

cloning base repo
  $ hg clone a b
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd b

setting up cset to push
  $ hg up null
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ touch a
different msg so we get a clog new entry
  $ hg ci -Am b
  adding a
  created new head

pushing
  $ hg push -f ../a
  pushing to ../a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 0 changes to 0 files (+1 heads)

  $ cd ..