Mercurial > hg

view tests/test-issue1438.t @ 17394:19e4861f9730 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: merging bookmarked heads 45b5eb2941d0 fixed an error that occured when heads being merged were both inactive bookmarks. Add a test for that case.
author John Li <jli@circularly.org>
date Mon, 27 Aug 2012 09:57:58 -0400
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