Mercurial > hg

view tests/test-issue1438.t @ 44392:efd73cdcfbac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
relnotes: move entry to the right spot It appears a conflict resolution went wrong. Differential Revision: https://phab.mercurial-scm.org/D8151
author Valentin Gatien-Baron <vgatien-baron@janestreet.com>
date Wed, 26 Feb 2020 10:56:27 -0500
parents 2fc86d92c4a9
children 55c6ebd11cb9
line wrap: on
line source

#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