view tests/test-extra-filelog-entry.t @ 45874:781b09790633

tests: show that interactive shelve can leave the repo with a merge state

If part of a file is shelved (as we already do in a test), there will
be an unfinished merge state left after `hg shelve` finishes. There
should never be a merge conflict and there should never be a reason
that the user would like to re-resolve conflicts, so we should clear
that state (see next patch).

Differential Revision: https://phab.mercurial-scm.org/D9334

Issue351: mq: qrefresh can create extra revlog entry

  $ echo "[extensions]" >> $HGRCPATH
  $ echo "mq=" >> $HGRCPATH

  $ hg init
  $ hg qinit

  $ echo b > b
  $ hg ci -A -m foo
  adding b

  $ echo cc > b
  $ hg qnew -f foo.diff
  $ echo b > b
  $ hg qrefresh

  $ hg debugindex b
     rev linkrev nodeid       p1           p2
       0       0 1e88685f5dde 000000000000 000000000000