annotate tests/test-pull-permission.t @ 45587:768412472663

merge: store cases when a file is absent post merge in commitinfo

Some merges can result in file being absent form working directory. This can be
one of file was kept deleted or file was removed by merge code.

User might revert the file back before committing. In such cases we will like to
have better handling and create new filenodes.

We store this info in mergestate as commitinfo so that we can use it while
committing to create new filenode if required.

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

#require unix-permissions no-root

  $ hg init a
  $ cd a
  $ echo foo > b
  $ hg add b
  $ hg ci -m "b"

  $ chmod -w .hg/store

  $ cd ..

  $ hg clone a b
  requesting all changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files
  new changesets 97310831fa1a
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ chmod +w a/.hg/store # let test clean up

  $ cd b
  $ hg verify
  checking changesets
  checking manifests
  crosschecking files in changesets and manifests
  checking files
  checked 1 changesets with 1 changes to 1 files

  $ cd ..