view tests/test-issue1438.t @ 19049:2e5476980a57

subrepo: fix test breakage introduced in 2b34d004e644 The test didn't break when I originally committed it (git version 1.7.12.4 (Apple Git-37)), and still doesn't on that machine, but the output changes elsewhere with "Warning: you are leaving N commits behind..." This change sets a ref on the commit we're updating the subrepo _away_ from to quash the warning.
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 21 Feb 2013 21:05:06 +0000
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