Mercurial > hg

view tests/test-issue1438.t @ 12994:845c602b8635

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: allow git subrepos to push and merge (master branch only) gitsubrepo based on patch from David Soria Parra: http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/
author Eric Eisner <ede@mit.edu>
date Sun, 14 Nov 2010 18:22:33 -0500
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