view tests/test-issue1438.t @ 24179:14d647d25c70

merge-tools: configuration for Beyond Compare on OS X Based on the Linux configuration entry.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 27 Feb 2015 21:42:58 +0100
parents 7a9cbb315d84
children 2fc86d92c4a9
line wrap: on
line source

#require symlink

http://mercurial.selenic.com/bts/issue1438

  $ 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