Mercurial > hg

view tests/test-issue1438.t @ 22911:509e2cbee679

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: separate 'lookup' status field from others The status tuple returned from dirstate.status() has an additional field compared to the other status tuples: lookup/unsure. This field is just an optimization and not something most callers care about (they want the resolved value of 'modified' or 'clean'). To prepare for a single future status type, let's separate out the 'lookup' field from the rest by having dirstate.status() return a pair: (lookup, status).
author Martin von Zweigbergk <martinvonz@gmail.com>
date Fri, 03 Oct 2014 21:44:10 -0700
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