Mercurial > hg

view tests/test-issue1438.t @ 20651:c1a52dd56eb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add blank line between mergestate's method This class is now too big to be a single big block of continuous text.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 05 Mar 2014 10:22:43 -0800
parents b63f6422d2a7
children 7a9cbb315d84
line wrap: on
line source

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

  $ "$TESTDIR/hghave" symlink || exit 80

  $ 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