tests/test-issue1438.t
author Siddharth Agarwal <sid0@fb.com>
Wed, 14 Oct 2015 16:04:43 -0700
changeset 26741 e1568d5eb052
parent 26420 2fc86d92c4a9
child 49585 55c6ebd11cb9
permissions -rw-r--r--
localrepo.commit: disallow commit when driver-resolved files exist This code will not currently be activated because there's no code to mark files as driver-resolved in core. This point is also somewhat hard to plug into from extensions.

#require symlink

https://bz.mercurial-scm.org/1438

  $ hg init

  $ ln -s foo link
  $ hg add link
  $ hg ci -mbad link
  $ hg rm link
  $ hg ci -mok
  $ hg diff -g -r 0:1 > bad.patch

  $ hg up 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg import --no-commit bad.patch
  applying bad.patch

  $ hg status
  R link
  ? bad.patch